lyhzzz 2 years ago
parent
commit
6df9b3d895

+ 4 - 0
src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -106,6 +106,10 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
             if(!StringUtils.isEmpty(record.getOrderSn()) && !record.getOrderSn().contains("O")){
             if(!StringUtils.isEmpty(record.getOrderSn()) && !record.getOrderSn().contains("O")){
                 IncrementOrderMg incrementOrderMg = iIncrementOrderMgService.getByOrderSn(record.getOrderSn());
                 IncrementOrderMg incrementOrderMg = iIncrementOrderMgService.getByOrderSn(record.getOrderSn());
                 if(incrementOrderMg != null){
                 if(incrementOrderMg != null){
+                    vo.setCustomerName(incrementOrderMg.getCustomerName());
+                    vo.setCustomerType(incrementOrderMg.getCustomerType());
+                    vo.setEndCustomer(incrementOrderMg.getEndCustomer());
+                    vo.setIncrementTypeId(incrementOrderMg.getIncrementType());
                     vo.setUseType(incrementOrderMg.getUseType());
                     vo.setUseType(incrementOrderMg.getUseType());
                     vo.setProjectNum(incrementOrderMg.getProjectNum());
                     vo.setProjectNum(incrementOrderMg.getProjectNum());
                     vo.setRemark(incrementOrderMg.getRemark());
                     vo.setRemark(incrementOrderMg.getRemark());

+ 25 - 23
src/main/java/com/fdkankan/manage/vo/response/UserIncrementVo.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.Data;
 
 
 @Data
 @Data
-public class UserIncrementVo {
+public class UserIncrementVo extends IncrementOrderVo{
     private Long id;                                //会员权益id
     private Long id;                                //会员权益id
     private String snCode;                          //相机snCode
     private String snCode;                          //相机snCode
     private String incrementStartTime;              //购买日期
     private String incrementStartTime;              //购买日期
@@ -16,26 +16,28 @@ public class UserIncrementVo {
 
 
     private Integer validTimeType;      // 0年,1月,2日
     private Integer validTimeType;      // 0年,1月,2日
 
 
-    private String projectNum;
-
-    private Integer useType;
-
-    private String useTypeStr;
-
-    private String remark;
-
-    public String getUseTypeStr() {
-        if(useType == null){
-            return "";
-        }
-        switch (useType){
-            case 1 : return "项目实施";
-            case 2 : return "客户试用";
-            case 3 : return "内部测试";
-            case 4 : return "正常销售";
-            case 5 : return "渠道推广";
-            case 6 : return "其它";
-            default: return "";
-        }
-    }
+    private Integer IncrementTypeId;
+
+//    private String projectNum;
+//
+//    private Integer useType;
+//
+//    private String useTypeStr;
+//
+//    private String remark;
+//
+//    public String getUseTypeStr() {
+//        if(useType == null){
+//            return "";
+//        }
+//        switch (useType){
+//            case 1 : return "项目实施";
+//            case 2 : return "客户试用";
+//            case 3 : return "内部测试";
+//            case 4 : return "正常销售";
+//            case 5 : return "渠道推广";
+//            case 6 : return "其它";
+//            default: return "";
+//        }
+//    }
 }
 }