fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionSellerController.java

@@ -149,7 +149,12 @@ public class DistributionSellerController extends BaseController {
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         loginBody.setSellerId(loginUser.getUser().getSellerId());
-        wxLoginService.bindWxGzhUnionIdSeller(loginBody);
+        if(Validator.isNotEmpty(loginBody.getGzhOpenid())){
+            wxLoginService.bindWxGzhOpenIdSeller(loginBody);
+        }
+        else if(Validator.isNotEmpty(loginBody.getCode())){
+            wxLoginService.bindWxGzhUnionIdSeller(loginBody);
+        }
         return AjaxResult.success();
     }
 

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -1272,6 +1272,20 @@ public class WxLoginService implements IWxLoginService {
         }
         return user;
     }
+    public DistributionSeller bindWxGzhOpenIdSeller(WxLoginBody loginBody) {
+        DistributionSeller seller = iDistributionSellerService.getOne(new LambdaQueryWrapper<DistributionSeller>().eq(DistributionSeller::getSellerId,loginBody.getSellerId()));
+        if (seller == null) {
+            throw new CustomException("您尚未注册，请前往小程序注册");
+        }
+        if(Validator.isNotEmpty(loginBody.getGzhOpenid())){
+            seller.setGzhOpenId(loginBody.getGzhOpenid());
+        }
+        if(Validator.isNotEmpty(loginBody.getUnionId())){
+            seller.setUnionId(loginBody.getUnionId());
+        }
+        iDistributionSellerService.updateById(seller);
+        return seller;
+    }
 
     public DistributionSeller bindWxGzhUnionIdSeller(WxLoginBody loginBody) {
         initData();

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/SellerAppAccountLoginBo.java

@@ -28,4 +28,5 @@ public class SellerAppAccountLoginBo {
     private String tel;
     @ApiModelProperty("验证码")
     private String code;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/bo/WxLoginBody.java

@@ -56,4 +56,10 @@ public class WxLoginBody {
 
     @ApiModelProperty("业务员ID")
     private Long sellerId;
+
+    @ApiModelProperty("openid")
+    private String gzhOpenid;
+
+    @ApiModelProperty("union_id")
+    private String unionId;
 }