Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java

@@ -202,7 +202,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
         Assert.notNull(loginUser, "登录失效,请重新登录!");
         List<RechargeOrderDO> orderDOS = rechargeOrderMapper.selectList(Wrappers.<RechargeOrderDO>lambdaQuery()
                 .eq(RechargeOrderDO::getUid, loginUser.getId())
-                .ne(RechargeOrderDO::getPaid, 0)
+                .ne(RechargeOrderDO::getPaid, 1)
                 .orderByDesc(RechargeOrderDO::getCreateTime));
         if (!CollectionUtils.isEmpty(orderDOS)) {
             List<RechargeOrderRespVO> rechargeOrderRespVOS = RechargeOrderConvert.INSTANCE.convertList(orderDOS);

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/AppPromoterCreateReqVO.java

@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.member.controller.admin.promoter.vo;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.validation.Mobile;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * @Title:AppPromoterCreateReqVO
+ * @Description: app扫码创建推广员
+ * @author: tangqian
+ * @date: 2023/6/5 14:21
+ * @version: V1.0.0
+ */
+@Data
+public class AppPromoterCreateReqVO implements Serializable {
+    @Schema(description = "推广员名称", required = true, example = "5841")
+    @NotEmpty(message = "推广员名称不能为空")
+    @Size(max = 10,message = "推广员名称最长不能超过{max}")
+    private String nickname;
+
+
+    @Schema(description = "推广员手机号", example = "15601691300")
+    @Mobile
+    @NotEmpty(message = "推广员手机号不能为空")
+    private String mobile;
+
+    /**
+     * 帐号状态
+     * <p>
+     * 枚举 {@link CommonStatusEnum}
+     */
+    @Schema(description = "帐号状态")
+    @NotNull
+    private Integer status;
+
+    @Schema(description = "注册来源,通过字典获取:source_type")
+    @NotEmpty(message = "注册来源不能为空")
+    private String sourceType;
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterBaseVO.java

@@ -37,5 +37,8 @@ public class PromoterBaseVO {
     @Schema(description = "帐号状态")
     @NotNull
     private Integer status;
+    @Schema(description = "注册来源,通过字典获取:source_type")
+    @NotEmpty(message = "注册来源不能为空")
+    private String sourceType;
 
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterRespVO.java

@@ -18,4 +18,6 @@ public class PromoterRespVO extends PromoterBaseVO {
 
     @Schema(description = "组织简称", required = true, example = "18443")
     private String deptName;
+    @Schema(description = "注册来源", required = true, example = "1")
+    private String sourceType;
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java

@@ -4,6 +4,8 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.module.member.controller.admin.promoter.vo.AppPromoterCreateReqVO;
+import cn.iocoder.yudao.module.member.controller.admin.promoter.vo.PromoterCreateReqVO;
 import cn.iocoder.yudao.module.member.controller.admin.promoter.vo.PromoterRespVO;
 import cn.iocoder.yudao.module.member.controller.admin.user.vo.AppUserInfoReqVO;
 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppUserInfoRespVO;
@@ -13,8 +15,8 @@ import cn.iocoder.yudao.module.member.convert.user.UserConvert;
 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
 import cn.iocoder.yudao.module.member.service.promoter.PromoterService;
 import cn.iocoder.yudao.module.member.service.user.MemberUserService;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -22,7 +24,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -82,6 +83,7 @@ public class AppUserController {
             appUserInfoRespVO.setUserType(UserTypeEnum.MEMBER);
         }
         appUserInfoRespVO.setUserId(user.getId());
+        appUserInfoRespVO.setIsPromoter(promoterService.checkIsPromoterByUserId(user.getId()));
         return success(appUserInfoRespVO);
     }
 
@@ -120,5 +122,11 @@ public class AppUserController {
         list.add(userSpreadBannerVO);
         return CommonResult.success(list);
     }
+
+    @PostMapping("/create")
+    @Operation(summary = "扫码创建推广员")
+    public CommonResult<Long> appCreatePromoter(@Valid @RequestBody AppPromoterCreateReqVO createReqVO) {
+        return success(promoterService.appCreatePromoter(createReqVO));
+    }
 }
 

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppUserInfoRespVO.java

@@ -31,4 +31,9 @@ public class AppUserInfoRespVO {
 
     @Schema(description = "组织全称", required = true, example = "15601691300")
     private String parentDeptName;
+
+    @Schema(description = "是否是推广员", required = true, example = "15601691300")
+    private Boolean isPromoter;
+
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/promoter/PromoterDO.java

@@ -42,4 +42,8 @@ public class PromoterDO  implements Serializable {
 
     private LocalDateTime createTime;
 
+    /**
+     * 注册来源
+     */
+    private String sourceType;
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterService.java

@@ -89,4 +89,5 @@ public interface PromoterService {
     PromoterImportRespVO importUserList(List<PromoterImportExcelVO> importUsers, boolean isUpdateSupport);
     PromoterDO getPromoterDOByUserId(Long userId);
 
+    Long appCreatePromoter(AppPromoterCreateReqVO createReqVO);
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java

@@ -93,6 +93,41 @@ public class PromoterServiceImpl implements PromoterService {
         return promoter.getId();
     }
 
+    @Override
+    public Long appCreatePromoter(AppPromoterCreateReqVO createReqVO) {
+        //判断手机号是否注册
+        MemberUserDO memberUserDO = memberUserService.getUserByMobile(createReqVO.getMobile());
+        if (memberUserDO == null) {
+            //创建用户
+            memberUserDO = new MemberUserDO();
+            memberUserDO.setNickname(createReqVO.getNickname());
+            memberUserDO.setMobile(createReqVO.getMobile());
+            memberUserDO.setStatus(createReqVO.getStatus());
+            memberUserDO.setPassword(createReqVO.getMobile().substring(createReqVO.getMobile().length() - 6));
+            memberUserDO = memberUserService.createUserIfAbsent(createReqVO.getMobile(), createReqVO.getNickname(), getClientIP());
+        }
+        if(!TenantContextHolder.getTenantId().equals(memberUserDO.getTenantId())){
+            throw new ServiceException(PROMOTER_EXISTS_OTHER);
+        }
+
+        if (checkIsPromoterByUserId(memberUserDO.getId())) {
+            throw new ServiceException(PROMOTER_EXISTS);
+        }
+
+        // 插入
+        Long tenantId = TenantContextHolder.getTenantId();
+        DeptRespDTO deptRespDTO = deptApi.findParentDept(tenantId);
+        PromoterDO promoter = new PromoterDO();
+        promoter.setDeptId(deptRespDTO.getId());
+        promoter.setUserId(memberUserDO.getId());
+        promoter.setTenantId(tenantId);
+        promoter.setCreateTime(LocalDateTime.now());
+        promoter.setSourceType(createReqVO.getSourceType());
+        promoterMapper.insert(promoter);
+        // 返回
+        return promoter.getId();
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updatePromoter(PromoterUpdateReqVO updateReqVO) {
@@ -190,7 +225,7 @@ public class PromoterServiceImpl implements PromoterService {
         Set<String> collect = importUsers.stream().map(PromoterImportExcelVO::getMobile).collect(Collectors.toSet());
         List<String> collect2 = importUsers.stream().map(PromoterImportExcelVO::getMobile).collect(Collectors.toList());
         if (collect.size() != collect2.size()) {
-            respVO.getFailureUsernames().put("导入文件电话号码存在重复请检查!", "电话号码" + collect);
+            respVO.getFailureUsernames().put("导入文件电话号码存在重复请检查!", "");
             return respVO;
         }
 
@@ -226,6 +261,7 @@ public class PromoterServiceImpl implements PromoterService {
             promoter.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId());
             promoter.setUserId(userIfAbsent.getId());
             promoter.setCreateTime(LocalDateTime.now());
+            promoter.setSourceType("1");
             Long count = promoterMapper.selectCount(Wrappers.lambdaQuery(PromoterDO.class).eq(PromoterDO::getUserId, memberUserDO.getId()));
             if (count > 0) {
                 respVO.getFailureUsernames().put(importUser.getNickName(), "已经是推广员");

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java

@@ -99,8 +99,6 @@ public class MemberUserServiceImpl implements MemberUserService {
     }
 
     private MemberUserDO createUser(String mobile, String realName, String registerIp,Long promoterId) {
-        // 生成密码
-        String password = IdUtil.fastSimpleUUID();
         // 插入用户
         MemberUserDO user = new MemberUserDO();
         user.setMobile(mobile);

yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml

@@ -26,6 +26,9 @@
             <if test="data.mobile!=null and data.mobile!=''">
                 and b.mobile like CONCAT('%',#{data.mobile},'%')
             </if>
+            <if test="data.sourceType!=null">
+                and b.source_type =#{data.sourceType}
+            </if>
         </where>
     </select>
 

yudao-ui-admin/.env.test

@@ -1,11 +1,11 @@
 # 开发环境配置
-ENV = 'development'
+ENV = 'test'
 
 # 页面标题
 VUE_APP_TITLE = 创盈商户管理系统
 
 # 创盈管理系统/本地环境
-VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
+VUE_APP_BASE_API = 'http://api.nnhwl.top'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

yudao-ui-admin/package.json

@@ -7,10 +7,11 @@
   "scripts": {
     "local": "vue-cli-service serve --mode local",
     "dev": "vue-cli-service serve --mode dev",
-    "front": "vue-cli-service serve --mode front",
+    "test": "vue-cli-service serve --mode test",
     "build:prod": "vue-cli-service build --mode prod",
     "build:stage": "vue-cli-service build --mode stage",
     "build:dev": "vue-cli-service build --mode dev",
+    "build:test": "vue-cli-service build --mode test",
     "build:static": "vue-cli-service build --mode static",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",

yudao-ui-admin/src/settings.js

@@ -3,7 +3,7 @@ module.exports = {
   /**
    * 推广链接域名
    */
-  spreadDomain: 'http://h5.cyywl.top',
+  spreadDomain: process.env.ENV === 'production' ? 'http://h5.cyywl.top' : 'http://h5.nnhwl.top',
 
   /**
    * 推广码生成访问H5链接地址

yudao-ui-app/config/app.js

@@ -29,7 +29,15 @@ module.exports = {
 	//分页最多显示条数
 	LIMIT: 10,
   // 推广链接域名
+  // #ifdef DEV
+  SPREAD_DOMAIN: 'http://h5.nnhwl.top',
+  // #endif
+  // #ifdef TEST
+  SPREAD_DOMAIN: 'http://h5.nnhwl.top',
+  // #endif
+  // #ifdef PROD
   SPREAD_DOMAIN: 'http://h5.cyywl.top',
+  // #endif
   // 推广码生成访问H5链接地址
   SPREAD_LINK: '/pages/member_application/index',
 };

yudao-ui-app/package.json

@@ -22,6 +22,20 @@
           "UNI_PLATFORM": "h5",
           "isVConsole": true,
           "APP_BASE_URL": "http://192.168.1.188:48080"
+        },
+        "define": {
+          "DEV": true
+        }
+      },
+      "test": {
+        "title": "测试版",
+        "env": {
+          "UNI_PLATFORM": "h5",
+          "isVConsole": true,
+          "APP_BASE_URL": "http://api.nnhwl.top"
+        },
+        "define": {
+          "TEST": true
         }
       },
       "prod": {
@@ -30,6 +44,9 @@
           "UNI_PLATFORM": "h5",
           "isVConsole": false,
           "APP_BASE_URL": "http://api.cyywl.top"
+        },
+        "define": {
+          "PROD": true
         }
       }
     }