Merge branch 'dev-lt' into dev

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/WantBuySelectParam.java

@@ -45,7 +45,7 @@ public class WantBuySelectParam extends PageRequest {
     /**
      * 地区编码
      */
-    private String areaCode;
+    private String cityCode;
 
     /**
      * 地区级别

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

@@ -122,7 +122,6 @@ public class KwpWantBuyService {
         }
         PageHelper.startPage(wantBuySelectParam.getPage(), wantBuySelectParam.getPageSize());
         List<WantBuySelectRes> wantBuyDto = kwpWantBuyMapper.pageSelect(wantBuySelectParam);
-        System.out.println(wantBuyDto);
         if (CollectionUtils.isEmpty(wantBuyDto)) {
             return new PageRes<>();
         }
@@ -316,7 +315,7 @@ public class KwpWantBuyService {
     **/
     @Transactional(rollbackFor = Exception.class)
     public void dels(WantBuyDels param) {
-        List<String> ids = List.of(param.getIds().split(","));
+        List<String> ids = List.of(param.getIds().split(Global.COMMA));
         LambdaUpdateWrapper<KwoWantBuy> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.in(KwoWantBuy::getId, ids).eq(KwoWantBuy::getDelFlag, Global.NO)
                 .set(KwoWantBuy::getDelFlag, Global.YES)

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

@@ -61,8 +61,8 @@
                 #{item}
             </foreach>
         </if>
-        <if test="wantBuyReq.areaCode != null and wantBuyReq.areaCode != ''">
-            and kba.city_code = #{wantBuyReq.areaCode}
+        <if test="wantBuyReq.cityCode != null and wantBuyReq.cityCode != ''">
+            and kba.city_code = #{wantBuyReq.cityCode}
         </if>
     </sql>