submit

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -166,6 +166,7 @@ oldStudySys:
     educationalInspector: http://192.168.1.210/EduSystem/BusinessApi/NewYxtUserPrompt
     classUserListPath: http://gdxypx.xy.com/System/BussinessApi/UserCourseCategoryListcno
     classOpenPath: http://gdxypx.xy.com/System/BussinessApi/OpenClass
+    salePassword: http://gdxypx.xy.com/WitSystem/BussinessApi/GetSaleInfo
 
 officialPush:
     infoPath: http://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan

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

@@ -2,9 +2,10 @@ package com.zhongzheng.controller.distribution;
 
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.framework.web.service.WxLoginService;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterQueryBo;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityPosterService;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityService;
+import com.zhongzheng.modules.distribution.vo.SellerWxVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
@@ -30,6 +32,8 @@ public class CommonDistributionController extends BaseController {
 
     private final IDistributionActivityPosterService iDistributionActivityPosterService;
 
+    private final WxLoginService wxLoginService;
+
     @ApiOperation("获取分享页面参数")
     @PreAuthorize("@ss.hasPermi('system:poster:query')")
     @GetMapping("/sharePoster")
@@ -38,4 +42,10 @@ public class CommonDistributionController extends BaseController {
         return AjaxResult.success("成功",iDistributionActivityPosterService.sharePoster(bo));
     }
 
+    @ApiOperation("获取公众号openid")
+    @GetMapping("/gzh_openid")
+    public AjaxResult<SellerWxVo> gzh_openid(@RequestParam("code") String code) {
+        return AjaxResult.success("成功",wxLoginService.getGzhOpenId(code));
+    }
+
 }

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -166,6 +166,7 @@ oldStudySys:
     educationalInspector: http://192.168.1.210/EduSystem/BusinessApi/NewYxtUserPrompt
     classUserListPath: http://gdxypx.xy.com/System/BussinessApi/UserCourseCategoryListcno
     classOpenPath: http://gdxypx.xy.com/System/BussinessApi/OpenClass
+    salePassword: http://gdxypx.xy.com/WitSystem/BussinessApi/GetSaleInfo
 
 officialPush:
     infoPath: https://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan

zhongzheng-api/src/main/resources/application-dev.yml

@@ -170,6 +170,7 @@ oldStudySys:
     educationalInspector: http://192.168.1.210/EduSystem/BusinessApi/NewYxtUserPrompt
     classUserListPath: http://gdxypx.xy.com/System/BussinessApi/UserCourseCategoryListcno
     classOpenPath: http://gdxypx.xy.com/System/BussinessApi/OpenClass
+    salePassword: http://gdxypx.xy.com/WitSystem/BussinessApi/GetSaleInfo
 
 officialPush:
     infoPath: https://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysRole.java

@@ -101,7 +101,7 @@ public class SysRole implements Serializable
     @ApiModelProperty(value ="备注")
     private String remark;
 
-    private Long tenantId;
+    private String tenantId;
 
     /**
      * 请求参数

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

@@ -143,18 +143,25 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
             sysUser.setCreateTime(DateUtils.getNowDate());
             sysUser.setUpdateTime(DateUtils.getNowDate());
             sysUser.setCreateBy("client");
-            SysRole role = iSysRoleService.getOne(new LambdaQueryWrapper<SysRole>()
-                    .eq(SysRole::getRoleKey, "seller")
-                    .eq(SysRole::getStatus, 1).last("limit 1"));
-            if(Validator.isNotEmpty(role)){
-                sysUser.setRoleIds(new Long[]{role.getRoleId()});
-            }
-            iSysUserService.insertUser(sysUser);
+            initRole(sysUser);
         }
 
         return true;
     }
 
+    private void initRole(SysUser sysUser){
+        SysRole role = iSysRoleService.getOne(new LambdaQueryWrapper<SysRole>()
+                .eq(SysRole::getRoleKey, "seller")
+                .eq(SysRole::getStatus, 1).last("limit 1"));
+        SysRole role1 = iSysRoleService.getOne(new LambdaQueryWrapper<SysRole>()
+                .eq(SysRole::getRoleKey, "supervisory")
+                .eq(SysRole::getStatus, 1).last("limit 1"));
+        if(Validator.isNotEmpty(role) && Validator.isNotEmpty(role1)){
+            sysUser.setRoleIds(new Long[]{role.getRoleId(),role1.getRoleId()});
+        }
+        iSysUserService.insertUser(sysUser);
+    }
+
     @Override
     public Boolean forgetUser(SellerAppRegisterBo bo) {
         if(bo.getTel()==null){
@@ -400,13 +407,7 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
             sysUser.setSellerId(inertData.getSellerId());
             sysUser.setCreateTime(DateUtils.getNowDate());
             sysUser.setUpdateTime(DateUtils.getNowDate());
-            SysRole role = iSysRoleService.getOne(new LambdaQueryWrapper<SysRole>()
-                    .eq(SysRole::getRoleKey, "seller")
-                    .eq(SysRole::getStatus, 1).last("limit 1"));
-            if(Validator.isNotEmpty(role)){
-                sysUser.setRoleIds(new Long[]{role.getRoleId()});
-            }
-            iSysUserService.insertUser(sysUser);
+            initRole(sysUser);
         }
 
         return true;

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

@@ -1,9 +1,11 @@
 package com.zhongzheng.framework.web.service;
 
 import cn.hutool.core.lang.Validator;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.zhongzheng.common.constant.Constants;
+import com.zhongzheng.common.core.domain.entity.SysRole;
 import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.redis.RedisCache;
@@ -11,18 +13,20 @@ import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.exception.user.CaptchaException;
 import com.zhongzheng.common.exception.user.CaptchaExpireException;
 import com.zhongzheng.common.exception.user.UserPasswordNotMatchException;
-import com.zhongzheng.common.utils.AES;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.common.utils.MessageUtils;
-import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.common.utils.*;
+import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.framework.manager.AsyncManager;
 import com.zhongzheng.framework.manager.factory.AsyncFactory;
 import com.zhongzheng.modules.goods.bo.OldTenantLoginBo;
+import com.zhongzheng.modules.system.domain.SysUserRole;
 import com.zhongzheng.modules.system.service.ISysConfigService;
+import com.zhongzheng.modules.system.service.ISysRoleService;
+import com.zhongzheng.modules.system.service.ISysUserRoleService;
 import com.zhongzheng.modules.system.service.ISysUserService;
 import com.zhongzheng.modules.user.bo.UserBusinessLoginBo;
 import com.zhongzheng.modules.user.service.IUserLoginErrorService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -31,6 +35,8 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 登录校验方法
@@ -58,6 +64,16 @@ public class SysLoginService
     @Autowired
     private IUserLoginErrorService iUserLoginErrorService;
 
+    @Autowired
+    private ISysRoleService iSysRoleService;
+
+    @Autowired
+    private ISysUserRoleService iSysUserRoleService;
+
+
+    @Value("${oldStudySys.salePassword}")
+    private String SALE_PASSWORD;
+
     /**
      * 登录验证
      *
@@ -196,7 +212,26 @@ public class SysLoginService
             sysUser.setTenantId(Long.valueOf(bo.getTenantId()));
             sysUser.setUserName(bo.getAccount());
             //查询老系统密码
-            sysUser.setPassword("");
+            OldTenantLoginBo loginBo = new OldTenantLoginBo();
+            Long nowTime = DateUtils.getNowTime();
+            String sign = ToolsUtils.EncoderByMd5(nowTime.toString() + "pubilc2022");
+            loginBo.setSign(sign);
+            loginBo.setStamp(nowTime);
+            loginBo.setTenantId(bo.getTenantId());
+            loginBo.setAccount(bo.getAccount());
+            JSONObject param = JSONObject.parseObject(JSONObject.toJSONString(loginBo));
+            String respone = "";
+            try {
+                respone = HttpUtils.sendPost(SALE_PASSWORD, param);
+                if (!respone.contains("\"Status\":true")) {
+                    throw new CustomException("获取老系统用户密码错误" + respone);
+                }
+                JSONObject jsonObject = JSONObject.parseObject(respone);
+                String password = jsonObject.get("Message").toString();
+                sysUser.setPassword(SecurityUtils.encryptPassword(password));
+            } catch (Exception e) {
+                throw new CustomException("获取用户密码" + e.getMessage());
+            }
             sysUser.setNickName(bo.getAccount());
             sysUser.setSex("0");
             sysUser.setStatus(1L);
@@ -208,6 +243,8 @@ public class SysLoginService
             sysUser.setUpdateBy("admin");
             sysUser.setRemark("系统增加(老系统业务员跳转)");
             iSysUserService.save(sysUser);
+            //绑定用户角色
+            initRole(sysUser.getUserId(),bo.getTenantId());
         }
         LoginUser loginUser = new LoginUser();
         loginUser.setUser(sysUser);
@@ -215,6 +252,27 @@ public class SysLoginService
         return tokenService.createToken(loginUser);
     }
 
+    private void initRole(Long userId,String tenantId) {
+        //业务员管理员
+        SysRole role = iSysRoleService.getOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getRoleKey, "seller_admin"));
+        //隐藏工作台distribution/activity/cash/list
+        SysRole role1 = iSysRoleService.getOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getRoleKey, "supervisory"));
+        SysUserRole sysUserRole = new SysUserRole();
+        sysUserRole.setUserId(userId);
+        sysUserRole.setRoleId(role.getRoleId());
+        sysUserRole.setTenantId(Long.valueOf(tenantId));
+
+        SysUserRole sysUserRole1 = new SysUserRole();
+        sysUserRole1.setUserId(userId);
+        sysUserRole1.setRoleId(role1.getRoleId());
+        sysUserRole1.setTenantId(Long.valueOf(tenantId));
+
+        List<SysUserRole> sysUserRoleList = new ArrayList<>();
+        sysUserRoleList.add(sysUserRole);
+        sysUserRoleList.add(sysUserRole1);
+        iSysUserRoleService.saveBatch(sysUserRoleList);
+    }
+
    /* public String wx_login(String username)
     {
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();

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

@@ -17,7 +17,6 @@ import com.google.zxing.qrcode.QRCodeWriter;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.exception.CustomException;
-
 import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.*;
 import com.zhongzheng.common.utils.http.HttpUtils;
@@ -26,10 +25,10 @@ import com.zhongzheng.modules.alisms.service.IAliSmsService;
 import com.zhongzheng.modules.course.bo.SectionWatchPerBo;
 import com.zhongzheng.modules.distribution.domain.DistributionSeller;
 import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
+import com.zhongzheng.modules.distribution.vo.SellerWxVo;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
-import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.system.service.ISysConfigService;
 import com.zhongzheng.modules.user.bo.UserWxFollowAddBo;
 import com.zhongzheng.modules.user.domain.User;
@@ -1339,4 +1338,30 @@ public class WxLoginService implements IWxLoginService {
         }
         return null;
     }
+
+    public SellerWxVo getGzhOpenId(String code) {
+        initData();
+        String param = String.format(gzh_wxAuthParam, gzh_appid, gzh_appsrcret,code);
+        String resultString = HttpUtils.sendGet(gzh_wxAuthUrl, param);
+        //解析json
+        JSONObject jsonObject = (JSONObject) JSONObject.parse(resultString);
+        String access_token = String.valueOf(jsonObject.get("access_token"));
+        if(access_token.equals("null")){
+            throw new CustomException( String.valueOf(jsonObject.get("errmsg")));
+        }
+
+        String openId = String.valueOf(jsonObject.get("openid"));
+        String userInfoParam = String.format(gzh_wxUserInfoParam, access_token, openId);
+        String userInfoResultString = HttpUtils.sendGet(gzh_wxUserInfoUrl, userInfoParam);
+
+        //解析json
+        JSONObject jsonObject1 = (JSONObject) JSONObject.parse(userInfoResultString);
+        String unionId = String.valueOf(jsonObject1.get("unionid"));
+        SellerWxVo vo = new SellerWxVo();
+        vo.setOpenid(openId);
+        if(Validator.isNotEmpty(unionId)&&!unionId.equals("null")){
+            vo.setUnionid(unionId);
+        }
+        return vo;
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivity.java

@@ -1,9 +1,6 @@
 package com.zhongzheng.modules.distribution.domain;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -46,6 +43,7 @@ private static final long serialVersionUID=1L;
     /** 拥挤冻结期（天） */
     private Integer freezingPeriod;
     /** 备注 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String remark;
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityPoster.java

@@ -1,9 +1,6 @@
 package com.zhongzheng.modules.distribution.domain;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -42,6 +39,7 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
     /** 备注 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String remark;
     /** 备注 */
     private Long tenantId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionCashLog.java

@@ -47,6 +47,7 @@ private static final long serialVersionUID=1L;
     /** $column.columnComment */
     private Integer status;
     /** 备注 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String remark;
     /** 操作人员 */
     private String operName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionRebate.java

@@ -1,9 +1,6 @@
 package com.zhongzheng.modules.distribution.domain;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -59,5 +56,6 @@ private static final long serialVersionUID=1L;
     /** 机构ID */
     private Long tenantId;
     /** 备注 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityServiceImpl.java

@@ -567,6 +567,8 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
                 if (CollectionUtils.isNotEmpty(list)){
                     BigDecimal reduce = list.stream().map(DistributionRebate::getCash).reduce(BigDecimal.ZERO, BigDecimal::add);
                     item.setCashTotal(reduce);
+                }else {
+                    item.setCashTotal(new BigDecimal("0.00"));
                 }
             });
         }
@@ -627,6 +629,8 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
                 if (CollectionUtils.isNotEmpty(list)){
                     BigDecimal reduce = list.stream().map(DistributionRebate::getCash).reduce(BigDecimal.ZERO, BigDecimal::add);
                     item.setCashTotal(reduce);
+                }else {
+                    item.setCashTotal(new BigDecimal("0.00"));
                 }
             });
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/SellerWxVo.java

@@ -0,0 +1,25 @@
+package com.zhongzheng.modules.distribution.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 分销业务员提现申请分页查询对象 distribution_cash_withdrawal
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+@Data
+@ApiModel("业务员")
+public class SellerWxVo implements Serializable {
+
+	/** openid */
+	@ApiModelProperty("openid")
+	private String openid;
+	/** unionid */
+	@ApiModelProperty("unionid")
+	private String unionid;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/domain/DistributionActivityTemplate.java

@@ -1,9 +1,6 @@
 package com.zhongzheng.modules.top.distribution.domain;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -42,6 +39,7 @@ private static final long serialVersionUID=1L;
     /** 拥挤冻结期（天） */
     private Integer freezingPeriod;
     /** 备注 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String remark;
     /** 开始时间 */
     private Long startTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/domain/DistributionActivityTemplatePoster.java

@@ -1,9 +1,6 @@
 package com.zhongzheng.modules.top.distribution.domain;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -42,5 +39,6 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
     /** 备注 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/service/impl/DistributionActivityTemplateServiceImpl.java

@@ -433,7 +433,7 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
             SysRole role = iSysRoleService.getOneSysRole("seller_admin",id);
             if (ObjectUtils.isNotNull(role)){
                 List<SysUserRole> sysUserRoles = iSysUserRoleService.getList(role.getRoleId(),id);
-                InformRemindVo informRemindVo = informRemindService.getQueryByName("课程试卷未做完7天提醒");
+                InformRemindVo informRemindVo = informRemindService.getQueryByName("分销活动提醒");
                 if (CollectionUtils.isNotEmpty(sysUserRoles) && ObjectUtils.isNotNull(informRemindVo)){
                     sysUserRoles.forEach(item -> {
                         InformSysUserAddBo informUserAddBo = new InformSysUserAddBo();