feat(mall): 新增商品标签筛选功能并优化支付相关代码- 在商品搜索接口中添加标签筛选参数

- 更新数据库查询以支持标签筛选
- 移除冗余的支付相关代码
- 更新拉卡拉SDK的调用方式

ruoyi-modules/ruoyi-mall/pom.xml

@@ -139,12 +139,12 @@
             <version>5.3.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-pay-new</artifactId>
             <version>5.3.0</version>
             <scope>compile</scope>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
 </project>

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdMapper.java

@@ -60,7 +60,7 @@ public interface TzProdMapper extends BaseMapperPlus<TzProd, TzProdVo>, MPJBaseM
      * @param orderBy
      * @return
      */
-    IPage<TzProdVo> getSearchProdPageByProdName(@Param("page") IPage<TzProdBo> page, @Param("categoryId") Long categoryId, @Param("prodName") String prodName, @Param("envLevel") String envLevel, @Param("fireLevel") String fireLevel, @Param("trialScenario") String trialScenario, @Param("floor") Integer floor, @Param("sort") Integer sort, @Param("orderBy") Integer orderBy);
+    IPage<TzProdVo> getSearchProdPageByProdName(@Param("page") IPage<TzProdBo> page, @Param("categoryId") Long categoryId, @Param("prodName") String prodName, @Param("envLevel") String envLevel, @Param("fireLevel") String fireLevel, @Param("trialScenario") String trialScenario, @Param("label") Integer label, @Param("floor") Integer floor, @Param("sort") Integer sort, @Param("orderBy") Integer orderBy);
 
 
     /**

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdService.java

@@ -108,7 +108,7 @@ public interface ITzProdService extends MPJBaseService<TzProd> {
      * @param orderBy
      * @return
      */
-    IPage<TzProdVo> getSearchProdPageByProdName(PageQuery pageQuery, Long categoryId, String prodName, String envLevel, String fireLevel, String trialScenario, Integer floor, Integer sort, Integer orderBy);
+    IPage<TzProdVo> getSearchProdPageByProdName(PageQuery pageQuery, Long categoryId, String prodName, String envLevel, String fireLevel, String trialScenario, Integer label, Integer floor, Integer sort, Integer orderBy);
 
     /**
      * 商品收藏

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyOrderItemServiceImpl.java

@@ -8,9 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.lakala.zf.laop.java.sdk.demo.utils.KlkConstant;
-import com.lakala.zf.laop.java.sdk.demo.utils.V3LakalaOrderUtils;
 import com.lakala.zf.laop.java.sdk.demo.utils.V3LakalaUserUtils;
-import com.lkl.laop.sdk.request.V3LabsRelationRefundRequest;
+import com.lakala.zf.laop.java.sdk.demo.v3.V3LabsRelationRefundRequest;
 import com.lkl.laop.sdk.request.V3SacsBalanceSeparateRequest;
 import com.lkl.laop.sdk.request.model.V3LabsTradeLocationInfo;
 import lombok.RequiredArgsConstructor;
@@ -836,7 +835,7 @@ public class HyOrderItemServiceImpl extends MPJBaseServiceImpl<HyOrderItemMapper
             V3LabsTradeLocationInfo v3LabsTradeLocationInfo = new V3LabsTradeLocationInfo("124.223.107.31", null, null);
             v3LabsRelationRefundRequest.setLocationInfo(v3LabsTradeLocationInfo);
 
-            JSONObject jsonObject1 = V3LakalaOrderUtils.relationRefund(v3LabsRelationRefundRequest);
+            JSONObject jsonObject1 = V3LakalaUserUtils.relationRefund(v3LabsRelationRefundRequest);
             if ("BBS00000".equals(jsonObject1.getString("code"))) {
                 // 更新主订单付款金额
                 boolean orderResult = orderMapper.update(null,

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyOrderServiceImpl.java

@@ -8,9 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.lakala.zf.laop.java.sdk.demo.utils.KlkConstant;
-import com.lakala.zf.laop.java.sdk.demo.utils.V3LakalaOrderUtils;
 import com.lakala.zf.laop.java.sdk.demo.utils.V3LakalaUserUtils;
-import com.lkl.laop.sdk.request.V3LabsRelationRefundRequest;
+import com.lakala.zf.laop.java.sdk.demo.v3.V3LabsRelationRefundRequest;
 import com.lkl.laop.sdk.request.V3SacsBalanceSeparateRequest;
 import com.lkl.laop.sdk.request.model.V3LabsTradeLocationInfo;
 import lombok.RequiredArgsConstructor;
@@ -475,7 +474,7 @@ public class HyOrderServiceImpl extends MPJBaseServiceImpl<HyOrderMapper, HyOrde
             V3LabsTradeLocationInfo v3LabsTradeLocationInfo = new V3LabsTradeLocationInfo("124.223.107.31", null, null);
             v3LabsRelationRefundRequest.setLocationInfo(v3LabsTradeLocationInfo);
 
-            JSONObject jsonObject1 = V3LakalaOrderUtils.relationRefund(v3LabsRelationRefundRequest);
+            JSONObject jsonObject1 = V3LakalaUserUtils.relationRefund(v3LabsRelationRefundRequest);
             if ("BBS00000".equals(jsonObject1.getString("code"))) {
                 // 更新主订单状态为已取消
                 boolean orderResult = baseMapper.update(null,

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzBankCardServiceImpl.java

@@ -63,14 +63,14 @@ public class TzBankCardServiceImpl extends BaseCommonDemo implements ITzBankCard
 
     private final TzUserMapper userMapper;
 
-/*    private static String basePath = "D:\\lkl\\createFile\\";
+    private static String basePath = "D:\\lkl\\createFile\\";
 
-    private static String urlPrefix = "D:\\lkl\\file\\";*/
+    private static String urlPrefix = "D:\\lkl\\file\\";
 
 
-    private static String basePath = "/home/manage/jcs/createFile/";
+    /*private static String basePath = "/home/manage/jcs/createFile/";
 
-    private static String urlPrefix = "/home/manage/jcs/file/";
+    private static String urlPrefix = "/home/manage/jcs/file/";*/
 
     /**
      * 1-身份证正面 2-身份证反面 3-银行卡 4-营业执照 5-合作协议-纸质版 6-合作协议-电子版

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdServiceImpl.java

@@ -172,6 +172,7 @@ public class TzProdServiceImpl extends MPJBaseServiceImpl<TzProdMapper,TzProd> i
     private MPJLambdaWrapper<TzProd> buildQueryMPJWrapper(TzProdBo bo) {
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<TzProd> lqw = new MPJLambdaWrapper<>();
+        lqw.eq(bo.getProdId() != null, TzProd::getProdId, bo.getProdId());
         lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), TzProd::getTenantId, bo.getTenantId());
         lqw.like(StringUtils.isNotBlank(bo.getProdName()), TzProd::getProdName, bo.getProdName());
         lqw.like(StringUtils.isNotBlank(bo.getTenantName()), SysTenant::getCompanyName, bo.getTenantName());
@@ -453,9 +454,9 @@ public class TzProdServiceImpl extends MPJBaseServiceImpl<TzProdMapper,TzProd> i
     }
 
     @Override
-    public IPage<TzProdVo> getSearchProdPageByProdName(PageQuery pageQuery, Long categoryId, String prodName, String envLevel, String fireLevel, String trialScenario, Integer floor, Integer sort, Integer orderBy) {
+    public IPage<TzProdVo> getSearchProdPageByProdName(PageQuery pageQuery, Long categoryId, String prodName, String envLevel, String fireLevel, String trialScenario, Integer label, Integer floor, Integer sort, Integer orderBy) {
         IPage<TzProdBo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
-        return baseMapper.getSearchProdPageByProdName(page, categoryId, prodName, envLevel, fireLevel, trialScenario, floor, sort, orderBy);
+        return baseMapper.getSearchProdPageByProdName(page, categoryId, prodName, envLevel, fireLevel, trialScenario, label, floor, sort, orderBy);
     }
 
     /**

ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdMapper.xml

@@ -70,6 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="floor == 1">
             and p.is_floor = 1
         </if>
+        <if test="label != null">
+            and p.label = #{label}
+        </if>
         <if test="prodName != null and prodName != ''">
             and p.prod_name like concat('%',#{prodName} ,'%')
             or