FengChaoYu 6 kuukautta sitten
vanhempi
commit
50424cb3b6

+ 3 - 0
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/parts/WebsitPartsSalesOrderLogic.java

@@ -640,6 +640,9 @@ public class WebsitPartsSalesOrderLogic {
                             .setCompanyWechatName(partsSalesOrderBean.getCompanyWechatName())
                             .setWebsitId(partsSalesOrderBean.getWebsitId())
                             .setWebsitName(partsSalesOrderBean.getWebsitName())
+                            .setWorkerId(partsSalesOrderBean.getWorkerId())
+                            .setWorkerName(partsSalesOrderBean.getWorkerName())
+                            .setIdentity(partsSalesOrderBean.getIdentity())
                             .setMobile(partsSalesOrderBean.getMobile())
                             .setSalesId(partsSalesOrderBean.getId())
                             .setSalesItemId(itemBean.getId())

+ 4 - 3
mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsCreditVO.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @ApiModel
@@ -35,12 +36,12 @@ public class WebsitPartsCreditVO {
     @ApiModelProperty(value = "记账总金额")
     private BigDecimal total;
 
-    @ApiModelProperty(value = "记账总金额")
+    @ApiModelProperty(value = "已付款金额")
     private BigDecimal recTotal;
 
-    @ApiModelProperty(value = "记账总金额")
+    @ApiModelProperty(value = "未付款金额")
     private BigDecimal creditTotal;
 
     @ApiModelProperty(value = "更新时间")
-    private Data updateTime;
+    private Date updateTime;
 }

+ 3 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsSalesOrderLogic.java

@@ -712,6 +712,9 @@ public class WebsitPartsSalesOrderLogic {
                             .setCompanyWechatName(partsSalesOrderBean.getCompanyWechatName())
                             .setWebsitId(partsSalesOrderBean.getWebsitId())
                             .setWebsitName(partsSalesOrderBean.getWebsitName())
+                            .setWorkerId(partsSalesOrderBean.getWorkerId())
+                            .setWorkerName(partsSalesOrderBean.getWorkerName())
+                            .setIdentity(partsSalesOrderBean.getIdentity())
                             .setMobile(partsSalesOrderBean.getMobile())
                             .setSalesId(partsSalesOrderBean.getId())
                             .setSalesItemId(itemBean.getId())