Merge remote-tracking branch 'masetr/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/parts/OldRefundManageLogic.java

@@ -124,8 +124,8 @@ public class OldRefundManageLogic {
     }
 
     @Transactional
-    public String add(SalesCustomerPartsBean bean) {
-        try {
+    public String add(SalesCustomerPartsBean bean) throws Exception {
+//        try {
             ValidateUtil.validate(bean, ValidGroup.Add.class);
             for (SalesCustomerPartsItemBean itemBean : bean.getItems()) {
                 try {
@@ -228,26 +228,26 @@ public class OldRefundManageLogic {
             materialGoodsStockLogic.handleWorkerStock(workerStockDTOList);
 
             return sheetId;
-        } catch (Exception e) {
-            WorkerSalesCustomerInfo info = workerSalesCustomerInfoService.lambdaQuery()
-                    .eq(WorkerSalesCustomerInfo::getCompanyWechatId, bean.getCompanyWechatId())
-                    .eq(WorkerSalesCustomerInfo::getWorkOrderNo, bean.getWorkOrderNo())
-                    .eq(WorkerSalesCustomerInfo::getRepairFlag, bean.getRepairFlag())
-                    .one();
-
-            if (Objects.isNull(info)) {
-                info = new WorkerSalesCustomerInfo();
-                info.setErr(e.getMessage())
-                        .setSalesCustomerJson(JSONUtil.toJsonStr(bean))
-                        .setIdentity(bean.getIdentity())
-                        .setCompanyWechatId(bean.getCompanyWechatId())
-                        .insert();
-            } else {
-                info.setErr(e.getMessage())
-                        .updateById();
-            }
-        }
-        return null;
+//        } catch (Exception e) {
+//            WorkerSalesCustomerInfo info = workerSalesCustomerInfoService.lambdaQuery()
+//                    .eq(WorkerSalesCustomerInfo::getCompanyWechatId, bean.getCompanyWechatId())
+//                    .eq(WorkerSalesCustomerInfo::getWorkOrderNo, bean.getWorkOrderNo())
+//                    .eq(WorkerSalesCustomerInfo::getRepairFlag, bean.getRepairFlag())
+//                    .one();
+//
+//            if (Objects.isNull(info)) {
+//                info = new WorkerSalesCustomerInfo();
+//                info.setErr(e.getMessage())
+//                        .setSalesCustomerJson(JSONUtil.toJsonStr(bean))
+//                        .setIdentity(bean.getIdentity())
+//                        .setCompanyWechatId(bean.getCompanyWechatId())
+//                        .insert();
+//            } else {
+//                info.setErr(e.getMessage())
+//                        .updateById();
+//            }
+//        }
+//        return null;
     }
 
     private List<WorkerStockDTO> createWorkerStockDTO(WebsitPartsOldRefundManage partsOldRefundManage,

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())

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -453,7 +453,7 @@ public class PayOrderLogic {
         List<WorkerOrderItem> workerOrderItems = workerOrderItemService.lambdaQuery().eq(WorkerOrderItem::getOrderId, orderId).list();
 
 
-        workerOrder.setSource(commonLogic.getSource().equals(OrderInfoSourceEnum.A)?OrderInfoSourceEnum.A.getRemark():OrderInfoSourceEnum.B.getRemark() );
+        workerOrder.setSource(commonLogic.getSource().equals(OrderInfoSourceEnum.A.getRemark())?OrderInfoSourceEnum.A.getRemark():OrderInfoSourceEnum.B.getRemark() );
 
         workerOrder.setPayTime(new Date());
         workerOrder.setPayType(payType);

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsCreditItemVO.java

@@ -36,6 +36,10 @@ public class WebsitPartsCreditItemVO {
     @ApiModelProperty(value = "网点名称")
     private String websitName;
 
+    @ZfireField(hide = true)
+    @ApiModelProperty("师傅编号")
+    private String workerId;
+
     @ApiModelProperty("申请人")
     private String workerName;
 
@@ -60,7 +64,7 @@ public class WebsitPartsCreditItemVO {
 
     @ZfireField(tbName = "b")
     @ApiModelProperty("详细地址")
-    private String address;
+    private String addr;
 
     @ZfireField(tbName = "b")
     @ApiModelProperty("订单来源")
@@ -101,9 +105,9 @@ public class WebsitPartsCreditItemVO {
     @ApiModelProperty("收款状态")
     private PartsCreditEnum creditStatus;
 
-    @ApiModelProperty("收款人")
+    @ApiModelProperty("更新人")
     private String updateBy;
 
-    @ApiModelProperty("收款时间")
+    @ApiModelProperty("更新时间")
     private Date updateTime;
 }

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;
 }

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())

mall-server-api/src/main/resources/mapper/MaterialMapper.xml

@@ -1499,7 +1499,7 @@
         SELECT
             ${ex.selected}
         FROM
-            websit_parts_worker_credit_record a LEFT JOIN websit_sales b ON a.sales_id = b.sales_id
+            websit_parts_worker_credit_record a LEFT JOIN websit_parts_sales b ON a.sales_id = b.id
         ${ex.query}
         <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
             AND a.websit_id IN