大后台

src/main/java/common/controller/ContractController.java

@@ -55,9 +55,9 @@ public class ContractController {
         putdata(this, ContractStatusEnum.EXECUTING);
         putdata(this, ContractStatusEnum.END);
         putdata(this, ContractStatusEnum.CANCEL);
-        putdata(this, ContractStatusEnum.MONEY_BACK_ALL);
-        putdata(this, ContractStatusEnum.MONEY_BACK_PART);
-        putdata(this, ContractStatusEnum.MONEY_BACK_NONE);
+        putdata(this, ContractStatusEnum.BACK_ALL);
+        putdata(this, ContractStatusEnum.BACK_NONE);
+        putdata(this, ContractStatusEnum.BACK_PART);
         putdata(this, ContractStatusEnum.MONEY_BACK_FIRST);
         putdata(this, ContractStatusEnum.DELETE);
         putdata(this, ContractStatusEnum.FIRST_SIGNING);

src/main/java/common/model/Contract.java

@@ -33,10 +33,11 @@ public class Contract {
     private Long sale;
     //产品 trackingio or adi ...
     private String platform;
-    private String status;
+    private String status; // 作废  先回款待录入
     private String saleName;
 
     private Long payMoney; // 回款金额
+    private Integer backStatus; //  1 未回款 2 部分回款 3 已回款
     private Long invoice;  // 开票次数
     private BigDecimal invoiceMoney;  // 发票金额
     private String createName; // 创建人NAME
@@ -66,10 +67,7 @@ public class Contract {
     /**
      * 新增字段 20190427
      */
-//    private Long discountFlow; // 优惠流量
     private Long discountTimeLong; // 优惠时长
-//    private BigDecimal rebateMoney; //回款金额
-
     private String customerShort;// 客户简称
     private String customerThird;// 三方客户
     private int tradeType; // 行业id
@@ -384,14 +382,6 @@ public class Contract {
         this.createName = createName;
     }
 
-//    public Long getDiscountFlow() {
-//        return discountFlow;
-//    }
-//
-//    public void setDiscountFlow(Long discountFlow) {
-//        this.discountFlow = discountFlow;
-//    }
-
     public Long getDiscountTimeLong() {
         return discountTimeLong;
     }
@@ -503,13 +493,6 @@ public class Contract {
         this.adjustmentFundForm = adjustmentFundForm;
     }
 
-    //    public String getCreaterName() {
-//        return createrName;
-//    }
-//
-//    public void setCreaterName(String createrName) {
-//        this.createrName = createrName;
-//    }
 
     @Override
     public String toString() {
@@ -537,4 +520,12 @@ public class Contract {
                 ", ds='" + ds + '\'' +
                 '}';
     }
+
+    public Integer getBackStatus() {
+        return backStatus;
+    }
+
+    public void setBackStatus(Integer backStatus) {
+        this.backStatus = backStatus;
+    }
 }

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -1048,11 +1048,13 @@ public class ContractServiceImpl implements ContractService {
 
             } else if (resource.getPayMoney().longValue() <= 0) {
                 //未回款
-                resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey());
+//                resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey());
+                resource.setBackStatus(1);
 
             } else if (resource.getPayMoney().longValue() < resource.getMoney().longValue()) {
                 // 部分回款
-                resource.setStatus(ContractStatusEnum.MONEY_BACK_PART.getKey());
+//                resource.setStatus(ContractStatusEnum.MONEY_BACK_PART.getKey());
+                resource.setBackStatus(2);
 
                 //记录收款记录
                 money.setType("pay");
@@ -1061,7 +1063,8 @@ public class ContractServiceImpl implements ContractService {
 
             } else {
                 // 已回款
-                resource.setStatus(ContractStatusEnum.MONEY_BACK_ALL.getKey());
+//                resource.setStatus(ContractStatusEnum.MONEY_BACK_ALL.getKey());
+                resource.setBackStatus(3);
                 money.setType("pay");
                 money = saveContractMoney(money, loginUser, resource, type);
             }
@@ -1069,7 +1072,8 @@ public class ContractServiceImpl implements ContractService {
 
         } else {
             //未回款
-            resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey());
+            resource.setBackStatus(1);
+//            resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey());
         }
 
         if (money.getId() != null) {

src/main/java/dic/ContractStatusEnum.java

@@ -10,10 +10,15 @@ public enum ContractStatusEnum {
     EXECUTING("executing", "执行中"),
     END("end", "已结束"),
 
-    MONEY_BACK_ALL("backall", "已回款"),
+//    MONEY_BACK_ALL("backall", "已回款"),
+//    MONEY_BACK_NONE("backnone", "未回款"),
+//    MONEY_BACK_PART("backpart", "部分回款"),
+
+    BACK_NONE("1", "未回款"),
+    BACK_PART("2", "部分回款"),
+    BACK_ALL("3", "已回款"),
+
     MONEY_BACK_FIRST("backfirst", "先回款待录入"),
-    MONEY_BACK_NONE("backnone", "未回款"),
-    MONEY_BACK_PART("backpart", "部分回款"),
     CANCEL("cancel", "作废"),
     DELETE("del", "已删除"),