益寿缘-优化App看课红包,优化超拼网接口

fs-admin/src/main/java/com/fs/his/controller/OpenApiFsUserInformationController.java

@@ -61,7 +61,9 @@ public class OpenApiFsUserInformationController extends BaseController {
             SubmitUserInformationVO result = openApiFsUserInformationService.createUserInformationCPW(cpwUserAndAddressAddDTO);
             return AjaxResult.success(result);
         } catch (CustomException e) {
-            logger.error("创建用户信息与地址业务异常：{}", e.getMessage());
+            return AjaxResult.error(e.getCode(), e.getMessage());
+        } catch(Exception e) {
+            logger.error("创建用户信息与地址业务异常：", e);
             return AjaxResult.error("系统处理异常，请稍后重试");
         }
     }

fs-service/src/main/java/com/fs/his/dto/CPWUserBaseInfoAddDTO.java

@@ -9,7 +9,7 @@ public class CPWUserBaseInfoAddDTO {
     /**
      * 用户姓名
      */
-    private String realName;
+    private String name;
 
     /**
      * 身份证号码

fs-service/src/main/java/com/fs/his/validator/cpw/BaseInfoValidator.java

@@ -19,7 +19,7 @@ public class BaseInfoValidator implements Validator<CPWUserBaseInfoAddDTO> {
         }
 
         // 姓名校验
-        validateRealName(userBaseInfo.getRealName());
+        validateRealName(userBaseInfo.getName());
         
         // 手机号校验
         validateUserPhone(userBaseInfo.getUserPhone());

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserInformationCollectionServiceImpl.java

@@ -1083,7 +1083,8 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
     }
 
     @Override
-    @Transactional public R salesHelpConfirm(Long collectionId, Long operateId) {
+    @Transactional
+    public R salesHelpConfirm(Long collectionId, Long operateId) {
         if (collectionId == null) {
             return R.error("参数错误");
         }

fs-service/src/main/java/com/fs/hisStore/service/impl/OpenApiCPWUserInformationServiceImpl.java

@@ -69,6 +69,12 @@ public class OpenApiCPWUserInformationServiceImpl implements IOpenApiCPWUserInfo
         SubmitUserInformationVO resultVO=new SubmitUserInformationVO();
         //创建fs_user用户信息
         CPWUserBaseInfoAddDTO userBaseInfo = cpwUserAndAddressAddDTO.getUserBaseInfo();
+        FsUser queryCondition = new FsUser();
+        queryCondition.setIdCard(userBaseInfo.getIdCard());
+        List<FsUser> fsUsers = fsUserMapper.selectFsUserList(queryCondition);
+        if (CollectionUtils.isNotEmpty(fsUsers)){
+            throw new CustomException("用户信息保存失败，用户已存在", 500);
+        }
         FsUser addFsUser = transformUserDtoToFsUser(userBaseInfo);
         int addResult1 = fsUserMapper.insertFsUser(addFsUser);
         if (addResult1 <= 0) {
@@ -127,10 +133,9 @@ public class OpenApiCPWUserInformationServiceImpl implements IOpenApiCPWUserInfo
      * */
     private FsUser transformUserDtoToFsUser(CPWUserBaseInfoAddDTO userBaseInfo) {
         FsUser fsUser=new FsUser();
-        fsUser.setRealName(userBaseInfo.getRealName());
-        fsUser.setNickname("超拼网用户"+userBaseInfo.getUserPhone().substring(userBaseInfo.getUserPhone().length()-4));
+        fsUser.setRealName(userBaseInfo.getName());
+        fsUser.setNickname("超拼网用户:"+userBaseInfo.getName()+userBaseInfo.getUserPhone().substring(userBaseInfo.getUserPhone().length()-4));
         fsUser.setIdCard(userBaseInfo.getIdCard());
-        fsUser.setVipLevel(BigDecimal.ZERO.intValue());
         fsUser.setUserSource(2);//超拼网用户
         fsUser.setIsDel(BigDecimal.ZERO.intValue());
         fsUser.setStatus(BigDecimal.ONE.intValue());
@@ -144,7 +149,7 @@ public class OpenApiCPWUserInformationServiceImpl implements IOpenApiCPWUserInfo
      * */
     private FsUserAddress buildUserAddress(FsUserAddress fsUserAddress,FsUser addFsUser) {
         fsUserAddress.setUserId(addFsUser.getUserId());
-        fsUserAddress.setPhone(decryptPhone(addFsUser.getPhone()));
+        fsUserAddress.setPhone(addFsUser.getPhone());
         fsUserAddress.setDetail(fsUserAddress.getDetail().trim());
         fsUserAddress.setCreateTime(DateUtils.getNowDate());
         fsUserAddress.setIsDefault(BigDecimal.ONE.intValue());

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isBuy"    column="is_buy"    />
         <result property="password"    column="password"    />
         <result property="isVip"    column="is_vip"    />
+        <result property="idCard"    column="id_card"    />
         <result property="jpushId"    column="jpush_id"    />
         <result property="vipStartDate"    column="vip_start_date"    />
         <result property="vipEndDate"    column="vip_end_date"    />
@@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsUserVo">
-        select user_id,qw_ext_id,sex,is_buy,course_ma_open_id,is_push,is_add_qw,source,login_device,is_individuation_push,store_open_id,password,jpush_id, is_vip,vip_start_date,vip_end_date,vip_level,vip_status,nick_name,integral_status, avatar, phone, integral,sign_num, status, tui_user_id, tui_time, tui_user_count, ma_open_id, mp_open_id,app_open_id, union_id, is_del, user_code, remark, create_time, update_time, last_ip, balance,is_weixin_auth,parent_id,qw_user_id,company_id,company_user_id,first_login_time,app_roles,app_rewards_viewed_days,user_source from fs_user
+        select user_id,qw_ext_id,sex,is_buy,course_ma_open_id,is_push,is_add_qw,source,login_device,is_individuation_push,store_open_id,password,jpush_id,id_card,real_name, is_vip,vip_start_date,vip_end_date,vip_level,vip_status,nick_name,integral_status, avatar, phone, integral,sign_num, status, tui_user_id, tui_time, tui_user_count, ma_open_id, mp_open_id,app_open_id, union_id, is_del, user_code, remark, create_time, update_time, last_ip, balance,is_weixin_auth,parent_id,qw_user_id,company_id,company_user_id,first_login_time,app_roles,app_rewards_viewed_days,user_source from fs_user
     </sql>
 
     <select id="selectFsUserList" parameterType="FsUser" resultMap="FsUserResult">
@@ -69,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="integral != null "> and integral = #{integral}</if>
             <if test="signNum != null "> and sign_num = #{signNum}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="idCard != null "> and id_card = #{idCard}</if>
             <if test="tuiUserId != null  and tuiUserId != ''"> and tui_user_id = #{tuiUserId}</if>
             <if test="tuiTime != null "> and tui_time = #{tuiTime}</if>
             <if test="tuiUserCount != null "> and tui_user_count = #{tuiUserCount}</if>
@@ -574,6 +576,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into fs_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="nickName != null">nick_name,</if>
+            <if test="nickname != null">nickname,</if>
             <if test="avatar != null">avatar,</if>
             <if test="phone != null">phone,</if>
             <if test="integral != null">integral,</if>
@@ -597,6 +600,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isBuy != null">is_buy,</if>
             <if test="password != null">password,</if>
             <if test="jpushId != null">jpush_id,</if>
+            <if test="idCard != null">id_card,</if>
+            <if test="realName != null">real_name,</if>
             <if test="isVip != null">is_vip,</if>
             <if test="vipStartDate != null">vip_start_date,</if>
             <if test="vipEndDate != null">vip_end_date,</if>
@@ -622,6 +627,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="nickName != null">#{nickName},</if>
+            <if test="nickname != null">nickname,</if>
             <if test="avatar != null">#{avatar},</if>
             <if test="phone != null">#{phone},</if>
             <if test="integral != null">#{integral},</if>
@@ -645,6 +651,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isBuy != null">#{isBuy},</if>
             <if test="password != null">#{password},</if>
             <if test="jpushId != null">#{jpushId},</if>
+            <if test="idCard != null">#{idCard},</if>
+            <if test="realName != null">#{realName},</if>
             <if test="isVip != null">#{isVip},</if>
             <if test="vipStartDate != null">#{vipStartDate},</if>
             <if test="vipEndDate != null">#{vipEndDate},</if>

fs-user-app/src/main/java/com/fs/app/controller/AppUserRewardController.java

@@ -35,7 +35,7 @@ public class AppUserRewardController  extends AppBaseController{
     @Login
     @ApiOperation("跳转下发注册登录奖励")
     @GetMapping("/issueFirstLoginReward")
-    @NoRepeatSubmit(expire = 10, message = "请勿重复点击，正在处理中...")
+    @NoRepeatSubmit(expire = 5, message = "请勿重复点击，正在处理中...")
     public R issueFirstLoginReward() {
         String loginUserId = getUserId();
         if (StringUtils.isEmpty(loginUserId)){
@@ -57,7 +57,7 @@ public class AppUserRewardController  extends AppBaseController{
     @Login
     @ApiOperation("跳转下发App连续看课奖励")
     @PostMapping("/issueWatchCourseReward")
-    @NoRepeatSubmit(expire = 10, message = "请勿重复点击，正在处理中...")
+    @NoRepeatSubmit(expire = 5, message = "请勿重复点击，正在处理中...")
     public R issueWatchCourseReward(@RequestBody FsUserRewards queryRewards) {
         String loginUserId = getUserId();
         if (StringUtils.isEmpty(loginUserId)) {
@@ -105,7 +105,7 @@ public class AppUserRewardController  extends AppBaseController{
     @Login
     @ApiOperation("奖品列表用户领取奖励")
     @PostMapping("/claim")
-    @NoRepeatSubmit(expire = 5, message = "领取请求处理中，请勿重复提交")
+    @NoRepeatSubmit(expire = 5)
     public R claimRewards(@RequestBody ClaimRewardsAddDTO claimRewardsAddDTO) {//领取商品时必传收货地址id
         String loginUserId = getUserId();
         if (StringUtils.isEmpty(loginUserId)){