Merge remote-tracking branch 'origin/dev-chw' into dev-chw

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseOrderRevenue.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 营收明细表
+ * 
+ * @author zjw
+ * @email 18178966185@163.com
+ * @date 2019-07-11 14:14:54
+ */
+@Data
+@Table(name = "base_order_revenue")
+public class BaseOrderRevenue implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键id")
+    private Integer id;
+
+
+	@Column(name = "company_id")
+	@ApiModelProperty("店铺id")
+    private Integer companyId;
+
+
+
+	@Column(name = "order_no")
+	@ApiModelProperty(value = "订单号")
+	private String orderNo;
+
+
+
+	@Column(name = "user_id")
+	@ApiModelProperty(value = "下单用户id")
+	private Integer userId;
+
+	
+
+    @Column(name = "type")
+	@ApiModelProperty(value = "类型：1-租赁费；2-租赁费+上级拥金；3-违章押金")
+    private Integer type;
+	
+
+
+    @Column(name = "amount")
+	@ApiModelProperty(value = "进账金额")
+    private BigDecimal amount;
+
+
+
+	@Column(name = "status")
+	@ApiModelProperty(value = "状态：0-待结算；1-未提现；2-提现成功；3-提现失败")
+	private Integer status;
+	
+
+
+    @Column(name = "reson")
+	@ApiModelProperty(value = "失败原因")
+    private String reson;
+	
+
+
+    @Column(name = "cath_amount")
+	@ApiModelProperty(value = "提现金额")
+    private BigDecimal cathAmount;
+	
+
+
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间")
+    private Long crtTime;
+	
+
+	
+
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+
+
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "是否删除：0-正常；1-删除")
+    private Integer isDel;
+	
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseOrderRevenueBiz.java

+package com.github.wxiaoqi.security.admin.biz;
+
+
+
+import com.github.wxiaoqi.security.admin.entity.*;
+import com.github.wxiaoqi.security.admin.mapper.BaseOrderRevenueMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+
+@Service
+@Slf4j
+public class BaseOrderRevenueBiz extends BaseBiz<BaseOrderRevenueMapper, BaseOrderRevenue>{
+
+
+
+
+
+
+
+
+
+    public void addOrUpd(){
+
+
+    }
+
+
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BaseOrderRevenueMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+
+import com.github.wxiaoqi.security.admin.entity.BaseOrderRevenue;
+import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface BaseOrderRevenueMapper extends Mapper<BaseOrderRevenue>, SelectByIdListMapper<BaseOrderRevenue,Integer> {
+}
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -267,6 +267,7 @@ public class AppPermissionService {
 //        }
         if (StringUtils.isNotBlank(code)){
             //判断处理活动关键字
+            code=code.replaceAll("#","");
             String[] codes = code.split("_");
             if(codes.length > 0) {
                 String userCode = codes[0];
@@ -339,6 +340,7 @@ public class AppPermissionService {
             Integer companyId=0;
             if (StringUtils.isNotBlank(code)){
                 //判断处理活动关键字
+                code=code.replaceAll("#","");
                 String[] codes = code.split("_");
                 if(codes.length > 1) {
                     code = codes[0];
@@ -660,6 +662,7 @@ public class AppPermissionService {
                     String activityCode=null;
                     if (StringUtils.isNotBlank(code)){
                         //判断处理活动关键字
+                        code=code.replaceAll("#","");
                         String[] codes = code.split("_");
                         if(codes.length > 1) {
                             code = codes[0];
@@ -796,6 +799,7 @@ public class AppPermissionService {
         String activityCode=null;
         if (StringUtils.isNotBlank(code)){
             //判断处理活动关键字
+            code=code.replaceAll("#","");
             String[] codes = code.split("_");
             if(codes.length > 1) {
                 code = codes[0];
@@ -847,6 +851,7 @@ public class AppPermissionService {
             String activityCode=null;
             if (StringUtils.isNotBlank(code)){
                 //判断处理活动关键字
+                code=code.replaceAll("#","");
                 String[] codes = code.split("_");
                 if(codes.length > 1) {
                     code = codes[0];