no message

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

@@ -566,27 +566,28 @@ public class WebsitPartsSalesOrderLogic {
         partsSalesOrderBean.setStatus(PartsOrderStatusEnum.PAYED.getKey());
         partsSalesOrderBean.setPayFlag(PartsPayFlagEnum.PAY_NOT_TAKE.getKey());
         partsSalesOrderBean.setPayType(PayTypeEnum.CASH.getKey());
+        partsSalesOrderBean.setPayTime(DateUtil.date());
 
         this.handleForwardWebsitAndWorkerStock(partsSalesOrderBean);
 
 
         websitPartsSalesService.saveOrUpdate(partsSalesOrderBean);
 
-        new WebsitSalesPayOrder()
-                .setCompanyWechatId(partsSalesOrderBean.getCompanyWechatId())
-                .setCompanyWechatName(partsSalesOrderBean.getCompanyWechatName())
-                .setGoodsType(WebsitGoodsTypeEnum.P.getKey())
-                .setWebsitId(partsSalesOrderBean.getWebsitId())
-                .setWebsitName(partsSalesOrderBean.getWebsitName())
-                .setOrderId(partsSalesOrderBean.getId())
-                .setPayType(PayTypeEnum.CASH.getKey())
-                .setPayFlag(IsYesNoEnum.YES.getKey())
-                .setOrderCreateTime(partsSalesOrderBean.getCreateTime())
-                .setPayValue(partsSalesOrderBean.getTotalAmount())
-                .setPayTime(DateUtil.date())
-                .setOrderType(PayOrderTypeEnum.S.getKey())
-                .setOrderSource(SalesPayOrderSourceEnum.P_SALES.getKey())
-                .insert();
+//        new WebsitSalesPayOrder()
+//                .setCompanyWechatId(partsSalesOrderBean.getCompanyWechatId())
+//                .setCompanyWechatName(partsSalesOrderBean.getCompanyWechatName())
+//                .setGoodsType(WebsitGoodsTypeEnum.P.getKey())
+//                .setWebsitId(partsSalesOrderBean.getWebsitId())
+//                .setWebsitName(partsSalesOrderBean.getWebsitName())
+//                .setOrderId(partsSalesOrderBean.getId())
+//                .setPayType(PayTypeEnum.CASH.getKey())
+//                .setPayFlag(IsYesNoEnum.YES.getKey())
+//                .setOrderCreateTime(partsSalesOrderBean.getCreateTime())
+//                .setPayValue(partsSalesOrderBean.getTotalAmount())
+//                .setPayTime(DateUtil.date())
+//                .setOrderType(PayOrderTypeEnum.S.getKey())
+//                .setOrderSource(SalesPayOrderSourceEnum.P_SALES.getKey())
+//                .insert();
 
         return partsSalesOrderBean;
     }

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitSalesLogic.java

@@ -558,6 +558,7 @@ public class WebsitSalesLogic {
         websitSalesService.lambdaUpdate()
                 .set(WebsitSales::getFlag, MaterialSalesFlagEnum.PAY_NOT_TAKE.getKey())
                 .set(WebsitSales::getPayType, PayTypeEnum.CASH.getKey())
+                .set(WebsitSales::getPayTime, DateUtil.date())
                 .eq(WebsitSales::getSalesId, salesId)
                 .update();
 
@@ -572,20 +573,20 @@ public class WebsitSalesLogic {
         }
 
         // 生成现金支付记录
-        WebsitSalesPayOrder order = new WebsitSalesPayOrder();
-        order.setCompanyWechatId(sales.getCompanyWechatId());
-        order.setCompanyWechatName(sales.getCompanyWechatName());
-        order.setGoodsType(sales.getGoodsType());
-        order.setWebsitId(sales.getWebsitId());
-        order.setWebsitName(sales.getWebsitName());
-        order.setOrderId(sales.getSalesId());
-        order.setPayType(PayTypeEnum.CASH.getKey());
-        order.setPayFlag(IsYesNoEnum.YES.getKey());
-        order.setPayTime(sales.getSubmitTime());
-        order.setPayValue(sales.getTotalAmount());
-        order.setOrderType(PayOrderTypeEnum.S.getKey());
-        order.setOrderSource(sales.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) ? SalesPayOrderSourceEnum.M_SALES.getKey() : SalesPayOrderSourceEnum.P_SALES.getKey());
-        order.insert();
+//        WebsitSalesPayOrder order = new WebsitSalesPayOrder();
+//        order.setCompanyWechatId(sales.getCompanyWechatId());
+//        order.setCompanyWechatName(sales.getCompanyWechatName());
+//        order.setGoodsType(sales.getGoodsType());
+//        order.setWebsitId(sales.getWebsitId());
+//        order.setWebsitName(sales.getWebsitName());
+//        order.setOrderId(sales.getSalesId());
+//        order.setPayType(PayTypeEnum.CASH.getKey());
+//        order.setPayFlag(IsYesNoEnum.YES.getKey());
+//        order.setPayTime(sales.getSubmitTime());
+//        order.setPayValue(sales.getTotalAmount());
+//        order.setOrderType(PayOrderTypeEnum.S.getKey());
+//        order.setOrderSource(sales.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) ? SalesPayOrderSourceEnum.M_SALES.getKey() : SalesPayOrderSourceEnum.P_SALES.getKey());
+//        order.insert();
     }
 
     public List<WebsitSalesCategoryVO> existStockCategory(String websitId, String storageId) {