springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsEvaluateDTO.java
@@ -20,8 +20,8 @@ @ApiModel("评价记录请求") public class McsEvaluateDTO { @ApiModelProperty("戳戳卷码id") @NotNull(groups = {AddGroup.class}, message = "戳戳卷码id不能为空") @ApiModelProperty("戳戳券码id") @NotNull(groups = {AddGroup.class}, message = "戳戳券码id不能为空") private Long couponId; @ApiModelProperty("评分（1.差 2.一般 3.还不错 4.很满意 5.强烈推荐）") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/VerifiedReturnVO.java
@@ -27,7 +27,7 @@ @ApiModelProperty("奖励") private String award; @ApiModelProperty("卷码") @ApiModelProperty("券码") @JsonSerialize(using = ToStringSerializer.class) private Long couponId;
@@ -20,7 +20,7 @@ private Long id; /** * 戳戳卷码id * 戳戳券码id */ private Long couponId; /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsVerifiedRecord.java
@@ -20,7 +20,7 @@ private Long id; /** * 戳戳卷码id * 戳戳券码id */ private Long couponId; /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsCouponServiceImpl.java
@@ -87,18 +87,26 @@ */ @Override public R verifyMcsCoupon(Long couponId, Long userId) { McsMerchant mcsMerchant = mcsMerchantDAO.selectOne(new QueryWrapper<McsMerchant>().lambda() .eq(McsMerchant::getUserId, userId).eq(McsMerchant::getIsDel, false)); if (isNull(mcsMerchant) || !mcsMerchant.getUserId().equals(userId)) { McsCoupon mcsCoupon = this.baseMapper.selectById(couponId); if (isNull(mcsCoupon)) { return R.fail("无效券码"); } McsGame mcsGame = mcsGameDAO.selectById(mcsCoupon.getGameId()); if (isNull(mcsGame)) { return R.fail("资源不存在"); } McsMerchant mcsMerchant = mcsMerchantDAO.selectById(mcsGame.getMerchantId()); if (isNull(mcsMerchant)) { return R.fail("资源不存在"); } if (!mcsMerchant.getUserId().equals(userId)) { return R.fail("限指定商家核验"); } McsCoupon mcsCoupon = this.baseMapper.selectById(couponId); if (isNull(mcsCoupon) || mcsCoupon.getIsVerified()) { return R.fail("无效卷码"); if (mcsCoupon.getIsVerified()) { return R.fail("该券已核销"); } Date nowDate = new Date(); McsGame mcsGame = mcsGameDAO.selectById(mcsCoupon.getGameId()); if (isNull(mcsGame) || mcsGame.getExpireAt().before(nowDate)) { if (mcsGame.getExpireAt().before(nowDate)) { return R.fail("已过期"); } R<LoginUserInfoVO> userInfoVOR = userService.getUserInfoByUserId(mcsCoupon.getUserId().toString()); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsInformationServiceImpl.java
@@ -256,7 +256,7 @@ mcsMerchantVO.setId(mcsMerchant.getId()); mcsMerchantVO.setName(mcsMerchant.getName()); mcsMerchantVO.setLogo(mcsMerchant.getLogo()); mcsMerchantVO.setIntroduction(mcsMerchant.getLogo()); mcsMerchantVO.setIntroduction(mcsMerchant.getIntroduction()); mcsMerchantVO.setLat(mcsMerchant.getLat()); mcsMerchantVO.setLon(mcsMerchant.getLon()); mcsMerchantVO.setAddress(mcsMerchant.getAddress()); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
@@ -253,7 +253,7 @@ if (R.isOk(userInfoVOR) && nonNull(userInfoVOR.getData())) { LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(userInfoVOR.getData()), LoginUserInfoVO.class); mcsMerchant = new McsMerchant(); mcsMerchant.setName(isBlank(merchantName) ? "默认名称" : merchantName); mcsMerchant.setName(isBlank(merchantName) ? loginUserInfoVO.getName() : merchantName); mcsMerchant.setPhone(loginUserInfoVO.getPhone()); mcsMerchant.setAccount(loginUserInfoVO.getAccount()); mcsMerchant.setLevel(1); @@ -265,6 +265,9 @@ mcsMerchant.setCreatedBy(userId); mcsMerchant.setUpdatedBy(userId); num = this.baseMapper.insert(mcsMerchant); McsMerchantDTO mcsMerchantDTO = new McsMerchantDTO(); mcsMerchantDTO.setName(mcsMerchant.getName()); userService.putMcsMerchantUser(mcsMerchantDTO); } else { return R.fail("获取用户信息失败"); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsProductMapper.xml
@@ -46,7 +46,7 @@ </insert> <select id="pageMcsProduct" resultType="com.panzhihua.common.model.vos.community.microCommercialStreet.McsProductVO"> SELECT t1.id, t1.`name`, t1.image, t1.view_num, t1.`status`, t3.productLabel SELECT t1.id, t1.`name`, t1.image, t1.view_num, t1.`status`, t1.introduction, t3.productLabel FROM mcs_product t1 LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id LEFT JOIN (SELECT product_id, GROUP_CONCAT(label_name) AS productLabel FROM mcs_product_label GROUP BY product_id) t3 ON t1.id = t3.product_id springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -2823,12 +2823,21 @@ SysUserDO sysUserDO; sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda() .eq(SysUserDO::getAccount, mcsMerchantDTO.getAccount()).eq(SysUserDO::getType, 11)); String encode = new BCryptPasswordEncoder().encode(mcsMerchantDTO.getPassword()); if (nonNull(sysUserDO)) { return R.fail("账户已经存在"); BeanUtils.copyProperties(mcsMerchantDTO, sysUserDO); sysUserDO.setAccount(mcsMerchantDTO.getAccount()); sysUserDO.setStatus(mcsMerchantDTO.getAccountStatus()); sysUserDO.setPhone(mcsMerchantDTO.getPhone()); sysUserDO.setPassword(encode); sysUserDO.setPlaintextPassword(mcsMerchantDTO.getPassword()); userDao.updateById(sysUserDO); McsLoginUserInfoVO loginUserInfoVO = new McsLoginUserInfoVO(); BeanUtils.copyProperties(sysUserDO, loginUserInfoVO); return R.ok(loginUserInfoVO); } // sys_user 表 sysUserDO = new SysUserDO(); String encode = new BCryptPasswordEncoder().encode(mcsMerchantDTO.getPassword()); BeanUtils.copyProperties(mcsMerchantDTO, sysUserDO); sysUserDO.setAccount(mcsMerchantDTO.getAccount()); sysUserDO.setType(11); @@ -2871,6 +2880,7 @@ String account = mcsMerchantDTO.getAccount(); String phone = mcsMerchantDTO.getPhone(); Integer accountStatus = mcsMerchantDTO.getAccountStatus(); String name = mcsMerchantDTO.getName(); if (isNotBlank(account)) { sysUserDO.setAccount(account); } @@ -2880,6 +2890,9 @@ if (nonNull(accountStatus)) { sysUserDO.setStatus(accountStatus); } if (isNotBlank(name)) { sysUserDO.setName(name); } try { userDao.updateById(sysUserDO); } catch (Exception e) { springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/MicroCommercialStreetApi.java
@@ -5,7 +5,6 @@ import javax.annotation.Resource; import javax.validation.Valid; import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO; import org.springframework.beans.BeanUtils; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; @@ -20,6 +19,7 @@ import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsEvaluateDTO; @@ -73,6 +73,8 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import java.util.regex.Pattern; /** * @title: MicroCommercialStreetApi @@ -137,6 +139,9 @@ }) @GetMapping("/bind/verifyCode") public R getBindVerifyCode(@RequestParam("phone") String phone) { if (!assertPhoneIsValid(phone)) { return R.fail("手机号格式错误"); } String clientIP = this.getRequest().getHeader("X-Real-IP"); log.info("获取验证码用户ip信息【{}】", clientIP); try { @@ -217,6 +222,9 @@ }) @GetMapping("/verifyCode") public R getLoginVerifyCode(@RequestParam("phone") String phone) { if (!assertPhoneIsValid(phone)) { return R.fail("手机号格式错误"); } String clientIP = this.getRequest().getHeader("X-Real-IP"); log.info("获取验证码用户ip信息【{}】", clientIP); try { @@ -557,4 +565,9 @@ public R testTimeJob() { return communityService.offResourceForMcsMerchant(); } private Boolean assertPhoneIsValid(String phone) { String regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$"; return Pattern.matches(regexp, phone); } }
