2024年7月24日 新增用户注册来源

src/main/java/com/sqx/modules/app/controller/app/AppLoginController.java

@@ -118,8 +118,8 @@ public class AppLoginController {
     @RequestMapping(value = "/registerCode", method = RequestMethod.POST)
     @ApiOperation("app或h5注册或登录")
     @ResponseBody
-    public Result registerCode( String phone, String msg,String platform, Integer sysPhone,String openId,String inviterCode,String password,String userName,String avatar,String scanningChannel) {
-        return userService.registerCode(phone,msg,platform,sysPhone,openId,inviterCode,password,userName,avatar,scanningChannel);
+    public Result registerCode( String phone, String msg,String platform, Integer sysPhone,String openId,String inviterCode,String bindingConsortiaId,String password,String userName,String avatar,String scanningChannel) {
+        return userService.registerCode(phone,msg,platform,sysPhone,openId,inviterCode,bindingConsortiaId,password,userName,avatar,scanningChannel);
     }
 
     @ApiOperation("用户端发送验证码")

src/main/java/com/sqx/modules/app/entity/UserEntity.java

@@ -210,6 +210,11 @@ public class UserEntity implements Serializable {
 	 */
 	private String bankCardAddress;
 
+	/**
+	 * 扫二维码注册用户绑定商家ID
+	 */
+	private String bindingConsortiaId;
+
 	@TableField(exist = false)
 	private Integer member;
 	@TableField(exist = false)

src/main/java/com/sqx/modules/app/service/UserService.java

@@ -141,7 +141,7 @@ public interface UserService extends IService<UserEntity> {
      * @param scanningChannel
      * @return
      */
-    Result registerCode(String phone, String msg, String platform, Integer sysPhone, String openId, String inviterCode, String password, String userName, String avatar, String scanningChannel);
+    Result registerCode(String phone, String msg, String platform, Integer sysPhone, String openId, String inviterCode, String bindingConsortiaId, String password, String userName, String avatar, String scanningChannel);
 
 
     Result loginByOpenId(String openId);

src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -529,7 +529,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 
 
     @Override
-    public Result registerCode(String phone, String msg, String platform, Integer sysPhone, String openId, String inviterCode, String password, String userName, String avatar, String scanningChannel) {
+    public Result registerCode(String phone, String msg, String platform, Integer sysPhone, String openId, String inviterCode, String bindingConsortiaId, String password, String userName, String avatar, String scanningChannel) {
         Msg msg1 = msgDao.findByPhoneAndCode(phone, msg);
         //校验短信验证码
         if (msg1 == null) {
@@ -569,6 +569,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
             userInfo.setShopRate(new BigDecimal(commonInfoService.findOne(296).getValue()));
             userInfo.setPhone(phone);
             userInfo.setInviterCode(inviterCode);
+            userInfo.setBindingConsortiaId(bindingConsortiaId);//绑定注册用户的商户ID
             userInfo.setScanningChannel(scanningChannel);
             userInfo.setPlatform(platform);
             userInfo.setCreateTime(time);

src/main/java/com/sqx/modules/consortia/controller/ConsortiaController.java

@@ -106,5 +106,13 @@ public class ConsortiaController extends AbstractController {
     }
 
 
+    @GetMapping("/genOrGetQrCodePath")
+    @ApiOperation("生成或获取二维码地址")
+    public Result genOrGetQrCodePath(String id){
+        return consortiaService.genOrGetQrCodePath(id);
+    }
+
+
+
 
 }

src/main/java/com/sqx/modules/consortia/service/ConsortiaService.java

@@ -27,4 +27,6 @@ public interface ConsortiaService extends IService<Consortia> {
     Result selectConsortiaMoney(Long shopId,Integer flag,String time);
 
     Result selectConsortiaUserId(Long userId);
+
+	Result genOrGetQrCodePath(String id);
 }

src/main/java/com/sqx/modules/consortia/service/impl/ConsortiaServiceImpl.java

@@ -1,5 +1,7 @@
 package com.sqx.modules.consortia.service.impl;
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.extra.qrcode.QrCodeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -8,9 +10,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.common.utils.DateUtils;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
+import com.sqx.common.utils.SpringContextUtils;
 import com.sqx.modules.app.entity.UserEntity;
 import com.sqx.modules.app.service.UserService;
 import com.sqx.modules.artificer.service.ArtificerService;
+import com.sqx.modules.common.service.CommonInfoService;
 import com.sqx.modules.consortia.dao.ConsortiaDao;
 import com.sqx.modules.consortia.entity.Consortia;
 import com.sqx.modules.consortia.service.ConsortiaService;
@@ -29,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -40,6 +45,8 @@ public class ConsortiaServiceImpl extends ServiceImpl<ConsortiaDao, Consortia> i
     private UserService userService;
     @Autowired
     private ArtificerService artificerService;
+    @Autowired
+    private CommonInfoService commonRepository;
 
 
     @Override
@@ -141,5 +148,30 @@ public class ConsortiaServiceImpl extends ServiceImpl<ConsortiaDao, Consortia> i
         return Result.success().put("data",baseMapper.selectOne(query));
     }
 
+    @Override
+    public Result genOrGetQrCodePath(String id) {
+        //去附件里找有没有
+        String http = commonRepository.findOne(19).getValue();
+        String[] split = http.split("://");
+        // 上传文件路径
+        String baseAudioUploadPath = "/www/wwwroot/"+split[1]+"/file/uploadPath";
+
+        String baseFilePath = baseAudioUploadPath + "/" + "QrCode" + "/";
+        //创建文件
+        String filePath = baseFilePath + id + ".jpg";
+
+        File QRCodeFile = FileUtil.file(filePath);
+        //判断文件存不存在
+        if(!FileUtil.exist(filePath)){
+            //生成并保存并返回二维码
+            FileUtil.touch(filePath);
+            //获取前台地址
+            QrCodeUtil.generate(commonRepository.findOne(19).getValue() + "/pages/public/login?bindingConsortiaId=" + id, 300, 300, QRCodeFile);
+        }
+        //返回可访问地址
+        String url = StringUtils.replace(filePath,"/www/wwwroot/"+split[1],http);
+        return Result.success().put("imagePath",url);
+    }
+
 
 }

src/main/resources/mapper/app/UserDao.xml

@@ -239,6 +239,9 @@
             <if test="null != zhiFuBao and '' != zhiFuBao">
                 zhi_fu_bao
             </if>
+            <if test="null != bindingConsortiaId and '' != bindingConsortiaId">
+                binding_consortia_id
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="null != userName and '' != userName">
@@ -304,6 +307,9 @@
             <if test="null != zhiFuBao and '' != zhiFuBao">
                 #{zhiFuBao}
             </if>
+            <if test="null != bindingConsortiaId and '' != bindingConsortiaId">
+                #{bindingConsortiaId}
+            </if>
         </trim>
     </insert>
     <select id="takingOrdersMessage" resultType="com.sqx.modules.app.response.TakingOrderResponse">