fix

src/main/java/com/gogirl/application/common/impl/AgentUserServiceImpl.java

@@ -74,7 +74,7 @@ public class AgentUserServiceImpl extends ServiceImpl<AgentUserMapper, AgentUser
                 .deviceInfo("设备号")
                 .body("充值" + agentConfig.getRechargeAmount().intValue())
                 .detail("详情")
-                .attach("c")
+                .attach(gt.getBrandId().toString())
                 .outTradeNo(IdWorker.getIdStr())
                 //充值金额
                 .totalFee(agentConfig.getRechargeAmount().add(agentConfig.getBondAmount()).multiply(new BigDecimal("100")).intValue())
@@ -97,8 +97,9 @@ public class AgentUserServiceImpl extends ServiceImpl<AgentUserMapper, AgentUser
     @Override
     public void notifyChargeAgent(WxPayOrderNotifyResult result) {
         String openid = result.getOpenid();
+        Integer brandId = Integer.parseInt(result.getAttach());
         BigDecimal amount = new BigDecimal(result.getTotalFee()).divide(new BigDecimal(100), 2, RoundingMode.HALF_DOWN);
-        Customer customer = customerService.selectByOpenid1(openid);
+        Customer customer = customerService.selectByOpenid1(openid, brandId);
 
         AgentUser agentUser = this.selectByPhone(customer.getPhone(), customer.getBrandId());
 
@@ -239,7 +240,7 @@ public class AgentUserServiceImpl extends ServiceImpl<AgentUserMapper, AgentUser
             default:
                 throw new RRException("invalid type");
         }
-        AgentConfig agentConfig = agentConfigMapper.selectByRechargeAmount(agentUser.getCurrentRechargeAmount(),customer.getBrandId());
+        AgentConfig agentConfig = agentConfigMapper.selectByRechargeAmount(agentUser.getCurrentRechargeAmount(), customer.getBrandId());
         agentUser.setLevel(agentConfig.getId());
         agentUser.setDiscount(agentConfig.getDiscount());
         agentUserMapper.updateById(agentUser);
@@ -260,7 +261,7 @@ public class AgentUserServiceImpl extends ServiceImpl<AgentUserMapper, AgentUser
                 .deviceInfo("设备号")
                 .body("充值" + amount)
                 .detail("详情")
-                .attach("c")
+                .attach(gt.getBrandId().toString())
                 .outTradeNo(IdWorker.getIdStr())
                 //充值金额
                 .totalFee(amount.multiply(new BigDecimal("100")).intValue())
@@ -272,6 +273,6 @@ public class AgentUserServiceImpl extends ServiceImpl<AgentUserMapper, AgentUser
                 .sceneInfo("gogirl美甲美睫沙龙")
                 .build();
 
-        return wxPayService.createJsapiOrder(request,gt.getBrandId());
+        return wxPayService.createJsapiOrder(request, gt.getBrandId());
     }
 }

src/main/java/com/gogirl/application/user/customer/CustomerService.java

@@ -145,5 +145,5 @@ public interface CustomerService extends IService<Customer> {
      * @param openid1
      * @return
      */
-    Customer selectByOpenid1(String openid1);
+    Customer selectByOpenid1(String openid1,Integer brandId);
 }

src/main/java/com/gogirl/application/user/customer/impl/CustomerServiceImpl.java

@@ -262,7 +262,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         gogirlTokenService.updateByToken(gogirlToken);
 
         Customer customer = customerMapper.selectById(gogirlToken.getCustomerId());
-        Customer phoneCustomer = customerMapper.selectOne(new LambdaQueryWrapper<Customer>().eq(Customer::getPhone, phone));
+        Customer phoneCustomer = customerMapper.selectOne(new LambdaQueryWrapper<Customer>().eq(Customer::getPhone, phone).eq(Customer::getBrandId, gogirlToken.getBrandId()));
 
         if (StringUtils.isNotEmpty(customer.getPhone())) {
             throw new RRException("您已经授权过手机号");
@@ -592,10 +592,11 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     }
 
     @Override
-    public Customer selectByOpenid1(String openid1) {
+    public Customer selectByOpenid1(String openid1, Integer brandId) {
 
         return this.getOne(new LambdaQueryWrapper<Customer>()
-                .eq(Customer::getOpenid1, openid1));
+                .eq(Customer::getOpenid1, openid1)
+                .eq(Customer::getBrandId, brandId));
     }