no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/AllInPayLogic.java

@@ -11,12 +11,10 @@ import com.gree.mall.miniapp.enums.material.PartsOrderStatusEnum;
 import com.gree.mall.miniapp.enums.material.PartsPayFlagEnum;
 import com.gree.mall.miniapp.exception.RemoteServiceException;
 import com.gree.mall.miniapp.logic.material.parts.WebsitPartsSalesOrderLogic;
-import com.gree.mall.miniapp.plus.entity.WebsitPartsSales;
-import com.gree.mall.miniapp.plus.entity.WebsitPartsWorkerCreditRecord;
-import com.gree.mall.miniapp.plus.entity.WebsitSales;
-import com.gree.mall.miniapp.plus.entity.WebsitSalesPayOrder;
+import com.gree.mall.miniapp.plus.entity.*;
 import com.gree.mall.miniapp.plus.service.WebsitPartsSalesService;
 import com.gree.mall.miniapp.plus.service.WebsitPartsWorkerCreditRecordService;
+import com.gree.mall.miniapp.plus.service.WebsitSalesItemService;
 import com.gree.mall.miniapp.plus.service.WebsitSalesService;
 import com.gree.mall.miniapp.utils.ArithUtils;
 import com.gree.mall.miniapp.utils.DateUtils;
@@ -52,6 +50,8 @@ public class AllInPayLogic {
     WebsitPartsSalesOrderLogic websitPartsSalesOrderLogic;
     @Resource
     WebsitPartsWorkerCreditRecordService websitPartsWorkerCreditRecordService;
+    @Resource
+    WebsitSalesItemService websitSalesItemService;
 
     /**
      * 通联支付
@@ -212,8 +212,13 @@ public class AllInPayLogic {
                             .set(WebsitSales::getFlag, "PAY_NOT_TAKE")
                             .set(WebsitSales::getPayTime, DateUtils.parseDate2(fintime))
                             .set(WebsitSales::getPayNo, chnltrxid)
+                            .set(WebsitSales::getPayType, PayTypeEnum.ALLINPAY.getKey())
                             .eq(WebsitSales::getSalesId, order.getOrderId())
                             .update();
+                    websitSalesItemService.lambdaUpdate()
+                            .set(WebsitSalesItem::getPayType, PayTypeEnum.ALLINPAY.getKey())
+                            .eq(WebsitSalesItem::getSalesId, order.getOrderId())
+                            .update();
                 } else if (order.getOrderId().contains("PJ") && order.getOrderType().equals(PayOrderTypeEnum.S.getKey())) {
                     try {
                         log.info("执行配件库存处理方法");

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

@@ -561,8 +561,12 @@ public class WebsitSalesLogic {
                 .eq(WebsitSales::getSalesId, salesId)
                 .update();
 
-        if (sales.getSalesType().equals(WebsitSalesTypeEnum.ENGIN.getName())) {
+        websitSalesItemService.lambdaUpdate()
+                .set(WebsitSalesItem::getPayType, PayTypeEnum.CASH.getKey())
+                .eq(WebsitSalesItem::getSalesId, salesId)
+                .update();
 
+        if (sales.getSalesType().equals(WebsitSalesTypeEnum.ENGIN.getName())) {
             websitGoodsMangerLogic.givePrice(sales.getTotalAmount(), sales.getOrderEnginBaseId(), null, null, salesId, sales.getGoodsType());
             websitGoodsMangerLogic.upManage(sales.getOrderEnginBaseId(), sales.getGoodsType());
         }

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

@@ -1116,7 +1116,7 @@
         t1.vender_name,
         t2.goods_id,
         t2.goods_name,
-        t4.goods_category_name,
+        t2.goods_category_name,
         <!-- SUM(t2.purchaseQty) AS purchaseQty, -->
         SUM(t2.rec_qty) AS rec_qty,
         SUM(t2.rec_gift_qty) AS rec_gift_qty,