czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2025-12-05 16:09:35 +08:00
parent 402a64246b 58ab5374cf
commit 505f5fad91
12 changed files with 180 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.czg.service.market.service.impl;
import com.alibaba.fastjson2.JSONObject;
import com.czg.account.entity.ShopUser;
import com.czg.account.service.ShopUserService;
import com.czg.exception.CzgException;
import com.czg.market.dto.ChatCouponDTO;
import com.czg.market.dto.MkShopCouponGiftDTO;
@@ -17,6 +19,7 @@ import com.czg.market.service.ChatCouponService;
import com.czg.service.market.mapper.ChatCouponMapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +36,9 @@ public class ChatCouponServiceImpl extends ServiceImpl<ChatCouponMapper, ChatCou
private ShopCouponService couponService;
@Resource
private MkShopCouponRecordService recordService;
@DubboReference
private ShopUserService shopUserService;
@Override
@Transactional
@@ -94,11 +100,8 @@ public class ChatCouponServiceImpl extends ServiceImpl<ChatCouponMapper, ChatCou
@Override
@Transactional
public void grantChatCoupon(Long id, Long shopUserId, Long userId) {
ChatCoupon coupon = getOne(QueryWrapper.create()
.eq(ChatCoupon::getId, id)
.eq(ChatCoupon::getShopId, shopUserId)
);
public void grantChatCoupon(Long id, Long shopId, Long userId) {
ChatCoupon coupon = getById(id);
if (coupon == null) {
throw new CzgException("活动不存在");
}
@@ -108,7 +111,7 @@ public class ChatCouponServiceImpl extends ServiceImpl<ChatCouponMapper, ChatCou
boolean exists = recordService.exists(QueryWrapper.create()
.eq(MkShopCouponRecord::getSource, "群聊发放")
.eq(MkShopCouponRecord::getSourceId, coupon.getId())
.eq(MkShopCouponRecord::getShopUserId, shopUserId)
.eq(MkShopCouponRecord::getShopId, shopId)
.eq(MkShopCouponRecord::getUserId, userId)
);
if (exists) {
@@ -125,16 +128,20 @@ public class ChatCouponServiceImpl extends ServiceImpl<ChatCouponMapper, ChatCou
coupon.setStatus(3);
}
updateById(coupon);
ShopUser shopUser = shopUserService.getUserInfo(shopId, userId);
MkShopCouponRecord record = JSONObject.parseObject(coupon.getCouponJson(), MkShopCouponRecord.class);
record.setShopUserId(shopUserId);
record.setUserId(userId);
// MkShopCouponRecord record = JSONObject.parseObject(coupon.getCouponJson(), MkShopCouponRecord.class);
// record.setShopUserId(shopUserId);
// record.setUserId(userId);
// recordService.grantChatCoupon(record, coupon.getGetLimit());
if (shopUser == null) {
throw new CzgException("用户不存在");
}
MkShopCouponGiftDTO giftDTO = new MkShopCouponGiftDTO()
.setCouponId(coupon.getCouponId())
.setShopId(coupon.getShopId())
.setShopId(shopId)
.setSourceId(coupon.getId())
.setShopUserId(shopUserId)
.setShopUserId(shopUser.getId())
.setSource("群聊发放");
recordService.receiveCoupon(giftDTO, coupon.getGetLimit(), false);
}

27
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java
View File

@@ -6,21 +6,23 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSONObject;
import com.czg.account.dto.shopuser.ShopUserAddDTO;
import com.czg.account.entity.ShopInfo;
import com.czg.account.entity.ShopUser;
import com.czg.account.entity.UserInfo;
import com.czg.account.entity.table.ShopUserTableDef;
import com.czg.account.entity.table.UserInfoTableDef;
import com.czg.account.service.*;
import com.czg.account.service.ShopInfoService;
import com.czg.account.service.ShopUserService;
import com.czg.account.service.UserInfoService;
import com.czg.exception.CzgException;
import com.czg.market.dto.MemberConfigDTO;
import com.czg.account.entity.ShopInfo;
import com.czg.account.entity.UserInfo;
import com.czg.market.dto.MemberOrderDTO;
import com.czg.market.entity.MemberOrder;
import com.czg.market.entity.table.MemberOrderTableDef;
import com.czg.market.service.OrderInfoService;
import com.czg.market.service.MemberOrderService;
import com.czg.market.service.TbMemberConfigService;
import com.czg.market.vo.MemberConfigVO;
import com.czg.exception.CzgException;
import com.czg.market.dto.MemberOrderDTO;
import com.czg.market.vo.MmberOrderVO;
import com.czg.order.service.OrderPaymentService;
import com.czg.sa.StpKit;
import com.czg.service.market.enums.OrderStatusEnums;
import com.czg.service.market.mapper.MemberOrderMapper;
@@ -28,9 +30,6 @@ import com.czg.utils.AssertUtil;
import com.czg.utils.PageUtil;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.market.entity.MemberOrder;
import com.czg.market.service.MemberOrderService;
import jakarta.annotation.Resource;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.DubboService;
@@ -51,15 +50,9 @@ public class MemberOrderServiceImpl extends ServiceImpl<MemberOrderMapper, Membe
@DubboReference
private UserInfoService userInfoService;
@DubboReference
private UShopUserService uShopUserService;
@DubboReference
private ShopUserService shopUserService;
@DubboReference
private TbMemberConfigService memberConfigService;
@Resource
private OrderInfoService orderInfoService;
@DubboReference
private OrderPaymentService paymentService;
@Override
public Map<String, Object> pageInfo(String startTime, String endTime, String key) {
@@ -128,7 +121,7 @@ public class MemberOrderServiceImpl extends ServiceImpl<MemberOrderMapper, Membe
userInfo.setBirthDay(orderDTO.getBirthDay());
}
uShopUserService.join(orderDTO.getShopId(), orderDTO.getUserId(), new ShopUserAddDTO()
shopUserService.join(orderDTO.getShopId(), orderDTO.getUserId(), new ShopUserAddDTO()
.setPhone(userInfo.getPhone())
.setSex(userInfo.getSex())
.setHeadImg(userInfo.getHeadImg())

7
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
View File

@@ -11,7 +11,6 @@ import com.czg.account.dto.QueryReceiveDto;
import com.czg.account.entity.ShopInfo;
import com.czg.account.entity.ShopUser;
import com.czg.account.entity.UserInfo;
import com.czg.account.service.AShopUserService;
import com.czg.account.service.ShopInfoService;
import com.czg.account.service.ShopUserService;
import com.czg.account.service.UserInfoService;
@@ -63,8 +62,6 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
private ShopInfoService shopInfoService;
@DubboReference
private ShopUserService shopUserService;
@DubboReference
private AShopUserService aShopUserService;
@Resource
private ShopCouponMapper couponService;
@@ -248,7 +245,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
smsPushEventUser.setShopId(param.getShopId());
smsPushEventUser.setIsAll(1);
}
userList = aShopUserService.getPushEventUserList(smsPushEventUser);
userList = shopUserService.getPushEventUserList(smsPushEventUser);
// 2. 将JSON字符串解析为JSONArray
JSONArray couponArray = JSON.parseArray(param.getCoupon());
@@ -284,7 +281,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
smsPushEventUser.setShopId(param.getShopId());
smsPushEventUser.setIsAll(1);
}
userList = aShopUserService.getPushEventUserList(smsPushEventUser);
userList = shopUserService.getPushEventUserList(smsPushEventUser);
// 2. 将JSON字符串解析为JSONArray
JSONArray couponArray = JSON.parseArray(param.getCoupon());