shopId为空时 余额为0
This commit is contained in:
@@ -29,6 +29,7 @@ import com.chaozhanggui.system.cashierservice.util.TokenUtil;
|
|||||||
import com.chaozhanggui.system.cashierservice.wxUtil.WechatUtil;
|
import com.chaozhanggui.system.cashierservice.wxUtil.WechatUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.codec.digest.DigestUtils;
|
import org.apache.commons.codec.digest.DigestUtils;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
@@ -78,30 +79,35 @@ public class UserContoller {
|
|||||||
// }
|
// }
|
||||||
@GetMapping("/shopUserInfo")
|
@GetMapping("/shopUserInfo")
|
||||||
public Result shopUserInfo(@RequestParam("userId") String userId ,@RequestHeader("openId") String openId,@RequestParam("shopId") String shopId ) throws Exception {
|
public Result shopUserInfo(@RequestParam("userId") String userId ,@RequestHeader("openId") String openId,@RequestParam("shopId") String shopId ) throws Exception {
|
||||||
TbShopUser shopUser = shopUserMapper.selectByUserIdAndShopId(userId,shopId);
|
TbShopUser shopUser=new TbShopUser();
|
||||||
if (ObjectUtil.isEmpty(shopUser)) {
|
if (StringUtils.isNotBlank(shopId)) {
|
||||||
TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(Integer.valueOf(userId));
|
shopUser = shopUserMapper.selectByUserIdAndShopId(userId, shopId);
|
||||||
shopUser = new TbShopUser();
|
if (ObjectUtil.isEmpty(shopUser)) {
|
||||||
shopUser.setName(tbUserInfo.getNickName());
|
TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(Integer.valueOf(userId));
|
||||||
shopUser.setSex(tbUserInfo.getSex());
|
shopUser = new TbShopUser();
|
||||||
shopUser.setBirthDay(tbUserInfo.getBirthDay());
|
shopUser.setName(tbUserInfo.getNickName());
|
||||||
shopUser.setLevel(Byte.parseByte("1"));
|
shopUser.setSex(tbUserInfo.getSex());
|
||||||
String dynamicCode = RandomUtil.randomNumbers(8);
|
shopUser.setBirthDay(tbUserInfo.getBirthDay());
|
||||||
shopUser.setCode(dynamicCode);
|
shopUser.setLevel(Byte.parseByte("1"));
|
||||||
shopUser.setTelephone(tbUserInfo.getTelephone());
|
String dynamicCode = RandomUtil.randomNumbers(8);
|
||||||
|
shopUser.setCode(dynamicCode);
|
||||||
|
shopUser.setTelephone(tbUserInfo.getTelephone());
|
||||||
|
shopUser.setAmount(BigDecimal.ZERO);
|
||||||
|
shopUser.setIsVip(Byte.parseByte("0"));
|
||||||
|
shopUser.setCreditAmount(BigDecimal.ZERO);
|
||||||
|
shopUser.setConsumeAmount(BigDecimal.ZERO);
|
||||||
|
shopUser.setConsumeNumber(0);
|
||||||
|
shopUser.setLevelConsume(BigDecimal.ZERO);
|
||||||
|
shopUser.setStatus(Byte.parseByte("1"));
|
||||||
|
shopUser.setShopId(shopId);
|
||||||
|
shopUser.setUserId(userId);
|
||||||
|
shopUser.setMiniOpenId(openId);
|
||||||
|
shopUser.setCreatedAt(System.currentTimeMillis());
|
||||||
|
shopUser.setUpdatedAt(System.currentTimeMillis());
|
||||||
|
shopUserMapper.insert(shopUser);
|
||||||
|
}
|
||||||
|
}else {
|
||||||
shopUser.setAmount(BigDecimal.ZERO);
|
shopUser.setAmount(BigDecimal.ZERO);
|
||||||
shopUser.setIsVip(Byte.parseByte("0"));
|
|
||||||
shopUser.setCreditAmount(BigDecimal.ZERO);
|
|
||||||
shopUser.setConsumeAmount(BigDecimal.ZERO);
|
|
||||||
shopUser.setConsumeNumber(0);
|
|
||||||
shopUser.setLevelConsume(BigDecimal.ZERO);
|
|
||||||
shopUser.setStatus(Byte.parseByte("1"));
|
|
||||||
shopUser.setShopId(shopId);
|
|
||||||
shopUser.setUserId(userId);
|
|
||||||
shopUser.setMiniOpenId(openId);
|
|
||||||
shopUser.setCreatedAt(System.currentTimeMillis());
|
|
||||||
shopUser.setUpdatedAt(System.currentTimeMillis());
|
|
||||||
shopUserMapper.insert(shopUser);
|
|
||||||
}
|
}
|
||||||
return Result.success(CodeEnum.SUCCESS,shopUser);
|
return Result.success(CodeEnum.SUCCESS,shopUser);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user