定时任务分销商逻辑修改

kmall-schedule/src/main/java/com/kmall/schedule/dao/QzOrderMapper.java

@@ -77,7 +77,7 @@ public interface QzOrderMapper {
 
     List<Map> queryReceiptOrderByDistList();
 
-    Map querySysConfigByKey(@Param("key") String key);
+    Map queryThirdMerchantBySn(@Param("thirdMerchSn") Integer thirdMerchSn);
 
     Map queryMkDistHierById(Map fromObject);
 

kmall-schedule/src/main/java/com/kmall/schedule/service/QzOrderService.java

@@ -1250,20 +1250,21 @@ public class QzOrderService {
     public void receiptOrderSaveDistSellStatis(){
         logger.info(">>>>>>>>>>>>>>>>>>>>receiptOrderSaveDistSellStatis is start ");
         logger.info(">>>>>>>>>>>>>>>>>>>>用户确认收货后，记录商品分销购买记录 ");
-        Map configMap = qzOrderMapper.querySysConfigByKey("IS_DIST_SELL");
-        String status = MapUtils.getString("status", configMap);
-        if(Dict.status.item_1.getItem().equalsIgnoreCase(status)) {//1为启用渠道销售功能
-            // 获取收货后的订单
-            List<Map> receiptOrderList = qzOrderMapper.queryReceiptOrderByDistList();
-            if (null != receiptOrderList && receiptOrderList.size() > 0) {
-                for (Map map : receiptOrderList) {
+
+        // 获取收货后的订单
+        List<Map> receiptOrderList = qzOrderMapper.queryReceiptOrderByDistList();
+        if (null != receiptOrderList && receiptOrderList.size() > 0) {
+            for (Map map : receiptOrderList) {
+                Integer thirdMerchSn = MapUtils.getInteger("thirdMerchSn", map);
+                Map distMap = qzOrderMapper.queryThirdMerchantBySn(thirdMerchSn);
+                String is_dist_sell_start = MapUtils.getString("is_dist_sell_start", distMap);
+                if(StringUtils.isNotEmpty(is_dist_sell_start) && Dict.status.item_1.getItem().equalsIgnoreCase(is_dist_sell_start)){
                     String orderSn = MapUtils.getString("orderSn", map);
                     Integer orderGoodsId = MapUtils.getInteger("orderGoodsId", map);
                     Integer storeId = MapUtils.getInteger("storeId", map);
                     Integer userId = MapUtils.getInteger("userId", map);
                     Long goodsId = MapUtils.getLong("goodsId", map);
                     BigDecimal goodsPrice = MapUtils.getBigDecimal("goodsPrice", map);
-                    Integer thirdMerchSn = MapUtils.getInteger("thirdMerchSn", map);
                     Integer supplierId = MapUtils.getInteger("supplierId", map);
                     Integer distId = MapUtils.getInteger("distId", map);
                     String distFlag = MapUtils.getString("distFlag", map);
@@ -1325,10 +1326,12 @@ public class QzOrderService {
                     isScanMap.put("orderGoodsId", orderGoodsId);
                     isScanMap.put("isDistSellScan", Dict.isDistSellScan.item_1.getItem());
                     qzOrderMapper.updateOrderGoodsIsScan(isScanMap);
+                }else{
+                    logger.info(">>>>>>>>>>>>>>>>>>>>第三方商户没有分销渠道权限 ");
                 }
-            }else{
-                logger.info(">>>>>>>>>>>>>>>>>>>>确认收货订单没有数据 ");
             }
+        }else{
+            logger.info(">>>>>>>>>>>>>>>>>>>>确认收货订单没有数据 ");
         }
         logger.info(">>>>>>>>>>>>>>>>>>>>receiptOrderSaveDistSellStatis is end ");
 

kmall-schedule/src/main/resources/mybatis/mapper/QzOrderMapper.xml

@@ -383,8 +383,8 @@
         AND o.is_onffline_order = 0 AND g.is_dist_sell_scan = 0 order by sell_alloc_history_id
     </select>
 
-    <select id="querySysConfigByKey" resultType="map">
-        select s.status from sys_config s where s.key = #{key}
+    <select id="queryThirdMerchantBySn" resultType="map">
+        select s.is_dist_sell_start from third_merchant_biz s where s.third_merch_sn = #{thirdMerchSn}
     </select>
 
     <select id="queryMkDistHierById" resultType="map" parameterType="map">