czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww' into test

Browse Source
This commit is contained in:
wangw
2024-08-29 10:27:21 +08:00
parent 75a8e9362f 01c6e5753c
commit f6876e3f9c
4 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java
View File

@@ -66,11 +66,6 @@ public class NotifyController {
} }
@RequestMapping("test")
public void test(@RequestParam String payOrderNO){
payService.test(payOrderNO);
}
@RequestMapping("notifyCallBack") @RequestMapping("notifyCallBack")
public String notifyCallBack(HttpServletRequest request){ public String notifyCallBack(HttpServletRequest request){

4
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java
View File

@@ -101,12 +101,14 @@ public class TbOrderInfo implements Serializable {
private List<TbOrderDetail> detailList; private List<TbOrderDetail> detailList;
private String winnnerNo; private String winnnerNo;
private String isWinner; private String isWinner;
private String shopName;
//根据状态返回 需付款 已付款 未付款 已退 //根据状态返回 需付款 已付款 未付款 已退
private String description; private String description;
public void setDescription() { public void setDescription(String shopName) {
this.shopName = shopName;
switch (status) { switch (status) {
case "closed": case "closed":
this.description = "已付款"; this.description = "已付款";

6
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@@ -220,9 +220,11 @@ public class OrderService {
// } // }
PageHelper.startPage(page, size); PageHelper.startPage(page, size);
List<TbOrderInfo> tbOrderInfos = orderInfoMapper.selectByUserId(userId, status); List<TbOrderInfo> tbOrderInfos = orderInfoMapper.selectByUserId(userId, status);
String shopName = "";
for (TbOrderInfo orderInfo : tbOrderInfos) { for (TbOrderInfo orderInfo : tbOrderInfos) {
orderInfo.setDescription(); TbShopInfo tbShopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
shopName = tbShopInfo.getShopName();
orderInfo.setDescription(shopName);
List<TbOrderDetail> list = tbOrderDetailMapper.selectAllByOrderId(orderInfo.getId()); List<TbOrderDetail> list = tbOrderDetailMapper.selectAllByOrderId(orderInfo.getId());
int num = 0; int num = 0;
for (TbOrderDetail orderDetail : list) { for (TbOrderDetail orderDetail : list) {

25
src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java
View File

@@ -274,19 +274,30 @@ public class UserService {
public Result openMember(OpenMemberVo memberVo) { public Result openMember(OpenMemberVo memberVo) {
TbShopUser tbShopUser = shopUserMapper.selectByUserIdAndShopId(memberVo.getId().toString(), memberVo.getShopId().toString()); TbShopUser tbShopUser = shopUserMapper.selectByUserIdAndShopId(memberVo.getId().toString(), memberVo.getShopId().toString());
if(tbShopUser!=null){ if (tbShopUser != null) {
tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName())?memberVo.getNickName():null); tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName()) ? memberVo.getNickName() : null);
tbShopUser.setHeadImg(StringUtils.isNotBlank(memberVo.getHeadImg())?memberVo.getHeadImg():null); tbShopUser.setHeadImg(StringUtils.isNotBlank(memberVo.getHeadImg()) ? memberVo.getHeadImg() : null);
tbShopUser.setTelephone(memberVo.getTelephone()); tbShopUser.setTelephone(memberVo.getTelephone());
tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay())?memberVo.getBirthDay():null); tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null);
tbShopUser.setIsVip(Byte.parseByte("1")); tbShopUser.setIsVip(Byte.parseByte("1"));
shopUserMapper.updateByPrimaryKeySelective(tbShopUser); shopUserMapper.updateByPrimaryKeySelective(tbShopUser);
}else { } else {
TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(memberVo.getId()); TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(memberVo.getId());
tbShopUser = shopUserMapper.selectPCByPhoneAndShopId(memberVo.getTelephone(), memberVo.getShopId().toString());
if (tbShopUser != null) {
tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName()) ? memberVo.getNickName() : null);
tbShopUser.setHeadImg(StringUtils.isNotBlank(memberVo.getHeadImg()) ? memberVo.getHeadImg() : null);
tbShopUser.setTelephone(memberVo.getTelephone());
tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null);
tbShopUser.setUserId(tbUserInfo.getId().toString());
tbShopUser.setMiniOpenId(tbUserInfo.getMiniAppOpenId());
shopUserMapper.updateByPrimaryKeySelective(tbShopUser);
return Result.success(CodeEnum.SUCCESS);
}
tbShopUser = new TbShopUser(); tbShopUser = new TbShopUser();
tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName())?memberVo.getNickName():null); tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName()) ? memberVo.getNickName() : null);
tbShopUser.setSex(Byte.parseByte("1")); tbShopUser.setSex(Byte.parseByte("1"));
tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay())?memberVo.getBirthDay():null); tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null);
tbShopUser.setLevel(Byte.parseByte("1")); tbShopUser.setLevel(Byte.parseByte("1"));
String dynamicCode = RandomUtil.randomNumbers(8); String dynamicCode = RandomUtil.randomNumbers(8);
tbShopUser.setCode(dynamicCode); tbShopUser.setCode(dynamicCode);