Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -11,6 +11,7 @@ import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.exception.CustomPromptException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.enums.ClientTypeEnum;
 import com.sckw.core.model.enums.CooperateTypeEnum;
 import com.sckw.core.model.enums.OrderRuleEnum;
 import com.sckw.core.model.enums.RedisOrderGenerateEnum;
@@ -96,11 +97,17 @@ public class KwoTradeOrderService {
     private final KwoTradeOrderContractService kwoTradeOrderContractService;
     private final KwoTradeOrderTrackService kwoTradeOrderTrackService;
 
-    @Value("${valet.order.list.url}")
-    private String valetOrderListUrl;
+    @Value("${url.order.list.valet.pc}")
+    private String pcValetListUrl;
 
-    @Value("${purchase.order.list.url}")
-    private String purchaseOrderListUrl;
+    @Value("${url.order.list.valet.app}")
+    private String appValetListUrl;
+
+    @Value("${url.order.list.purchase.pc}")
+    private String pcPurchaseListUrl;
+
+    @Value("${url.order.list.purchase.app}")
+    private String appPurchaseListUrl;
 
     /**
      * @desc: 采购下单草稿
@@ -321,10 +328,10 @@ public class KwoTradeOrderService {
             if (!Objects.equals(procureUser.getUserId(), LoginUserHolder.getUserId())) {
                 userInfos.add(procureUser);
             }
-            sendMsg(MessageEnum.ORDER_INITIATE_PURCHASE, map, purchaseOrderListUrl, userInfos);
+            sendMsg(MessageEnum.ORDER_INITIATE_PURCHASE, map, pcPurchaseListUrl, appPurchaseListUrl, userInfos);
             //给供应企业联系人发消息
             map.put("firmName", procureFireName);
-            sendMsg(MessageEnum.ORDER_NEW_PENDING, map, valetOrderListUrl, List.of(supplyUser));
+            sendMsg(MessageEnum.ORDER_NEW_PENDING, map, pcValetListUrl, appValetListUrl, List.of(supplyUser));
         } else {
             //代客下单
             //给创建人及供应企业联系人发消息
@@ -332,10 +339,10 @@ public class KwoTradeOrderService {
             if (!Objects.equals(supplyUser.getUserId(), LoginUserHolder.getUserId())) {
                 userInfos.add(supplyUser);
             }
-            sendMsg(MessageEnum.ORDER_INITIATE_SALE, map, valetOrderListUrl, userInfos);
+            sendMsg(MessageEnum.ORDER_INITIATE_SALE, map, pcValetListUrl, appValetListUrl, userInfos);
             //给采购企业联系人发消息
             map.put("firmName", supplyFireName);
-            sendMsg(MessageEnum.ORDER_NEW_VALET_MSG, map, purchaseOrderListUrl, List.of(procureUser));
+            sendMsg(MessageEnum.ORDER_NEW_VALET_MSG, map, pcPurchaseListUrl, appPurchaseListUrl, List.of(procureUser));
         }
     }
 
@@ -345,16 +352,18 @@ public class KwoTradeOrderService {
      * @date: 2023-09-06 15:57
      * @Param msgEnum: 消息枚举
      * @Param params: 消息变量
-     * @Param url: 消息调转url
+     * @Param pcUrl: pc消息调转url
+     * @Param appUrl: app消息调转url
      * @Param userInfos:  发送消息用户集合
      * @return: void
      */
-    private void sendMsg(MessageEnum msgEnum, Map<String, Object> params, String url, List<UserInfo> userInfos) {
-        SckwMessage msg = new SckwMessage();
-        msg.setRequestId(UUIDUtils.get32UUID())
-                .setMessageEnum(msgEnum)
-                .setParams(params)
-                .setMsgUrl(url)
+    private void sendMsg(MessageEnum msgEnum, Map<String, Object> params, String pcUrl, String appUrl, List<UserInfo> userInfos) {
+        Map<String, String> urls = new HashMap<>();
+        urls.put(ClientTypeEnum.pc.getValue(), pcUrl);
+        urls.put(ClientTypeEnum.app.getValue(), appUrl);
+        SckwMessage msg = new SckwMessage(msgEnum);
+        msg.setParams(params)
+                .setMsgUrls(urls)
                 .setUserInfos(userInfos)
                 .setCreateBy(LoginUserHolder.getUserId());
         log.info("有新的提醒消息：{}", JSON.toJSONString(msg));
@@ -980,7 +989,7 @@ public class KwoTradeOrderService {
         map.put("firmName", purchase.getFirmName());
         UserInfo supplyUser = new UserInfo();
         supplyUser.setUserId(supply.getContactsId()).setEntId(supply.getTopEntId());
-        sendMsg(MessageEnum.ORDER_REJECT_VALET, map, valetOrderListUrl, List.of(supplyUser));
+        sendMsg(MessageEnum.ORDER_REJECT_VALET, map, pcValetListUrl, appValetListUrl, List.of(supplyUser));
         //给订单创建人及采购企业联系人发消息
         map.put("firmName", supply.getFirmName());
         List<UserInfo> userInfos = new ArrayList<>();
@@ -992,7 +1001,7 @@ public class KwoTradeOrderService {
             purchaseUser.setUserId(purchase.getContactsId()).setEntId(purchase.getTopEntId());
             userInfos.add(purchaseUser);
         }
-        sendMsg(MessageEnum.ORDER_REJECT_PURCHASE, map, purchaseOrderListUrl, userInfos);
+        sendMsg(MessageEnum.ORDER_REJECT_PURCHASE, map, pcPurchaseListUrl, appPurchaseListUrl, userInfos);
     }
 
     /**

sckw-modules/sckw-order/src/main/resources/mapper/KwoWantBuyMapper.xml

@@ -51,10 +51,17 @@
             and kb.create_time <= #{wantBuyReq.endCreateTime,jdbcType=TIMESTAMP}
         </if>
         <if test="wantBuyReq.tradings != null and wantBuyReq.tradings.size() > 0">
-            and kt.trading in
-            <foreach collection="wantBuyReq.tradings" item="item" open="(" close=")" separator=",">
-                #{item,jdbcType=VARCHAR}
+            <!--私用and条件-->
+<!--            and kt.trading in-->
+<!--            <foreach collection="wantBuyReq.tradings" item="item" open="(" close=")" separator=",">-->
+<!--                #{item,jdbcType=VARCHAR}-->
+<!--            </foreach>-->
+            <!-- 使用 AND 条件 -->
+            and (
+            <foreach collection="wantBuyReq.tradings" item="item" separator=" and ">
+                kt.trading = #{item,jdbcType=VARCHAR}
             </foreach>
+            )
         </if>
         <if test="wantBuyReq.wantBuyIds != null and wantBuyReq.wantBuyIds.size() > 0">
             and kb.id in

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -10,11 +10,15 @@ import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.exception.CustomPromptException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.enums.ClientTypeEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.model.vo.TableBottom;
 import com.sckw.core.model.vo.TableStatisticRes;
 import com.sckw.core.model.vo.TableTop;
-import com.sckw.core.utils.*;
+import com.sckw.core.utils.BeanUtils;
+import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.NumberUtils;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.excel.utils.DateUtil;
@@ -79,8 +83,10 @@ public class KwpGoodsService {
     private final KwpGoodsPriceRangeService kwpGoodsPriceRangeService;
     private final StreamBridge streamBridge;
 
-    @Value("${goods.url.list}")
-    private String goodsListUrl;
+    @Value("${goods.url.list.pc}")
+    private String pcGoodsListUrl;
+    @Value("${goods.url.list.app}")
+    private String appGoodsListUrl;
 
 
     /**
@@ -706,11 +712,12 @@ public class KwpGoodsService {
         UserInfo createUser = new UserInfo();
         createUser.setUserId(goods.getCreateBy()).setEntId(goods.getEntId());
         userInfos.add(createUser);
-        SckwMessage msg = new SckwMessage();
-        msg.setRequestId(UUIDUtils.get32UUID())
-                .setMessageEnum(msgEnum)
-                .setParams(map)
-                .setMsgUrl(goodsListUrl)
+        HashMap<String, String> urlMap = new HashMap<>();
+        urlMap.put(ClientTypeEnum.app.getValue(), appGoodsListUrl);
+        urlMap.put(ClientTypeEnum.pc.getValue(), pcGoodsListUrl);
+        SckwMessage msg = new SckwMessage(msgEnum);
+        msg.setParams(map)
+                .setMsgUrls(urlMap)
                 .setUserInfos(userInfos)
                 .setCreateBy(LoginUserHolder.getUserId());
         log.info(msgEnum.getTitle() + "消息：{}", JSON.toJSONString(msg));