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

fs-service/src/main/java/com/fs/hisStore/mapper/FsStorePaymentScrmMapper.java

@@ -4,8 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fs.course.vo.FsStorePaymentUsetVo;
-import com.fs.his.domain.FsStorePayment;
+import com.fs.hisStore.vo.FsStorePaymentUsetVo;
 import com.fs.hisStore.domain.FsStorePaymentScrm;
 import com.fs.hisStore.param.FsStorePaymentParam;
 import com.fs.hisStore.param.FsStoreStatisticsParam;

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -1002,7 +1002,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 //查询并锁定未出库溯源码带行锁
                 List<FsStoreVerifyCodeScrm> availableVerifyCodes = verifyCodeMapper.selectUnOutboundVerifyCodesWithLock(productId, buyCount);
                 if (availableVerifyCodes == null || availableVerifyCodes.size() < buyCount) {
-                    String errorMsg = String.format("商品[%s]溯源码库存不足，需%s个，仅剩余%s个",
+                    String errorMsg = String.format("商品[%s]库存不足，需%s个，仅剩余%s个",
                             productName, buyCount, (availableVerifyCodes == null ? 0 : availableVerifyCodes.size()));
                     throw new ServiceException(errorMsg);
                 }
@@ -1197,7 +1197,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 //查询并锁定未出库溯源码带行锁
                 List<FsStoreVerifyCodeScrm> availableVerifyCodes = verifyCodeMapper.selectUnOutboundVerifyCodesWithLock(productId, buyCount);
                 if (availableVerifyCodes == null || availableVerifyCodes.size() < buyCount) {
-                    String errorMsg = String.format("商品[%s]溯源码库存不足",
+                    String errorMsg = String.format("商品[%s]库存不足",
                             productName, buyCount, (availableVerifyCodes == null ? 0 : availableVerifyCodes.size()));
                     throw new ServiceException(errorMsg);
                 }
@@ -5137,7 +5137,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 //查询并锁定未出库溯源码带行锁
                 List<FsStoreVerifyCodeScrm> availableVerifyCodes = verifyCodeMapper.selectUnOutboundVerifyCodesWithLock(productId, buyCount);
                 if (availableVerifyCodes == null || availableVerifyCodes.size() < buyCount) {
-                    String errorMsg = String.format("商品[%s]溯源码库存不足",
+                    String errorMsg = String.format("商品[%s]库存不足",
                             productName, buyCount, (availableVerifyCodes == null ? 0 : availableVerifyCodes.size()));
                     throw new ServiceException(errorMsg);
                 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStorePaymentScrmServiceImpl.java

@@ -33,12 +33,9 @@ import com.fs.core.config.WxMaConfiguration;
 import com.fs.core.utils.OrderCodeUtils;
 import com.fs.course.config.RedPacketConfig;
 import com.fs.course.domain.FsCourseRedPacketLog;
-import com.fs.course.dto.FsOrderDeliveryNoteDTO;
-import com.fs.course.dto.FsPaymentDeliveryNoteDTO;
-import com.fs.course.dto.OrderOpenIdTransDTO;
 import com.fs.course.mapper.FsCourseRedPacketLogMapper;
 import com.fs.course.service.IFsCourseRedPacketLogService;
-import com.fs.course.vo.FsStorePaymentUsetVo;
+import com.fs.hisStore.vo.FsStorePaymentUsetVo;
 import com.fs.his.domain.FsUser;
 import com.fs.his.domain.FsUserWx;
 import com.fs.his.service.IFsUserService;
@@ -47,7 +44,6 @@ import com.fs.his.utils.ConfigUtil;
 import com.fs.hisStore.config.StoreConfig;
 import com.fs.hisStore.enums.SysConfigEnum;
 import com.fs.hisStore.param.*;
-import com.fs.hisStore.vo.FsStoreOrderCodeOpenIdVo;
 import com.fs.huifuPay.domain.HuiFuCreateOrder;
 import com.fs.huifuPay.domain.HuifuCreateOrderResult;
 import com.fs.huifuPay.sdk.opps.core.utils.HuiFuUtils;

fs-service/src/main/java/com/fs/course/vo/FsStorePaymentUsetVo.java → fs-service/src/main/java/com/fs/hisStore/vo/FsStorePaymentUsetVo.java

@@ -1,4 +1,4 @@
-package com.fs.course.vo;
+package com.fs.hisStore.vo;
 
 import lombok.Data;
 

fs-service/src/main/resources/mapper/hisStore/FsStorePaymentScrmMapper.xml

@@ -196,7 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-        <select id="getPaymentUsetInfoList" resultType="com.fs.course.vo.FsStorePaymentUsetVo">
+        <select id="getPaymentUsetInfoList" resultType="com.fs.hisStore.vo.FsStorePaymentUsetVo">
             SELECT
                 sp.bank_transaction_id,
                 sp.open_id,