多店铺-回调

fs-service/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java

@@ -127,7 +127,10 @@ public class QwUserServiceImpl implements IQwUserService
         QwUser qwUser = qwUserMapper.selectQwUserById(loginParam.getQwUserId());
         Company company = companyService.selectCompanyById(qwUser.getCompanyId());
         if(company.getMaxPadNum() != null && company.getMaxPadNum() != -1){
-            qwUserMapper.selectCount(new QueryWrapper<QwUser>().eq("company_id", company.getCompanyId()).isNotNull("server_id"));
+           int padCount = qwUserMapper.selectCount(new QueryWrapper<QwUser>().eq("company_id", company.getCompanyId()).isNotNull("server_id"));
+           if (padCount>=company.getMaxPadNum()){
+               return R.error(501,"该销售公司绑定pad数量超过限制");
+           }
         }
         Integer serverStatus = qwUser.getServerStatus();
         if (serverStatus!=null && serverStatus==1){

fs-service/src/main/resources/application-dev-yjb.yml

@@ -164,3 +164,5 @@ token:
 openIM:
     secret: openIM123
     userID: imAdmin
+#是否为新商户，新商户不走mpOpenId
+isNewWxMerchant: true

fs-service/src/main/resources/application-druid-yjb.yml

@@ -138,3 +138,5 @@ rocketmq:
         group: test-group
         access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
         secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
+#是否为新商户，新商户不走mpOpenId
+isNewWxMerchant: true

fs-user-app/src/main/java/com/fs/app/controller/store/HuifuPayScrmController.java

@@ -48,7 +48,7 @@ public class HuifuPayScrmController {
                     inquiryOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1);
                     break;
                 case "store":
-                    storeOrderService.payConfirm(1,null,orderId[1],huiFuResult.getHf_seq_id(),huiFuResult.getOut_trans_id(),huiFuResult.getParty_order_id());
+                    storeOrderService.payConfirm(1,null,orderId[1],huiFuResult.getHf_seq_id(),null,null);
                     break;
                 case "package":
                     packageOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1);