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

src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -1703,7 +1703,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                             SubmitServiceImpl s=new SubmitServiceImpl();
                             try {
                                 String accessToken = weChatService.getAccessToken();
-                                List<String> openidList = orderClubMapper.getOpenidListByPermission(s.unionId);
+                                List<String> openidList = orderClubMapper.getOpenidListByPermission(orderClubMapper.getOpenidunionId(orderClubMapper.getUserId(order.getOrderId())));
                                 openidList.removeIf(Objects::isNull);
                                 String name= StringUtils.strip(orderClubMapper.getOrderIds(order.getOrderId()).toString().substring(0,11), "[]");
                                 String associateTitle = "订单支付成功！";

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -70,8 +70,6 @@ public class SubmitServiceImpl implements SubmitService {
     @Resource
     private PayOrderMapper payOrderMapper;
 
-    public static String unionId;
-    public static Integer oderid;
 
     /**
      * 生成订单
@@ -131,7 +129,6 @@ public class SubmitServiceImpl implements SubmitService {
     public ResponseJson<Map<String, Object>> generateOrder(SubmitDto submitDto) {
         // 获取机构用户Id
         Integer clubUserId = baseMapper.getUserIdByClubId(submitDto.getClubId());
-        unionId = submitDto.getUnionId();
         if (null == clubUserId || clubUserId == 0) {
             return ResponseJson.error("机构用户信息异常！", null);
         }
@@ -1563,7 +1560,7 @@ public class SubmitServiceImpl implements SubmitService {
             String name = "0";
             try {
                 String accessToken = weChatService.getAccessToken();
-                List<String> openidList = orderClubMapper.getOpenidListByPermission(unionId);
+                List<String> openidList = orderClubMapper.getOpenidListByPermission(orderClubMapper.getOpenidunionId(orderClubMapper.getUserId(mainOrder.getOrderId())));
                 openidList.removeIf(Objects::isNull);
                 String i = orderClubMapper.getOrderIds(mainOrder.getOrderId()).toString();
                 if (i.length() < 10) {