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

赠券修改

Browse Source
This commit is contained in:
张松
2025-11-25 13:44:12 +08:00
parent 19d51a691a
commit 921aa45ca1
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java
View File

@@ -201,7 +201,7 @@ public class ACouponController {
*/ */
@PostMapping("/grant") @PostMapping("/grant")
public CzgResult<Boolean> rewardCoupon(@Validated @RequestBody MkRewardCouponDTO rewardCouponDTO) { public CzgResult<Boolean> rewardCoupon(@Validated @RequestBody MkRewardCouponDTO rewardCouponDTO) {
return CzgResult.success(couponRecordService.grant(rewardCouponDTO.getShopId() != null ? rewardCouponDTO.getShopId() : StpKit.USER.getShopId(), rewardCouponDTO)); return CzgResult.success(couponRecordService.grant(rewardCouponDTO.getShopId() != null ? rewardCouponDTO.getShopId() : StpKit.USER.getShopId(), rewardCouponDTO, "管理员赠送"));
} }

2
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java
View File

@@ -63,6 +63,6 @@ public interface MkShopCouponRecordService extends IService<MkShopCouponRecord>
*/ */
void deleteRecord(Long id); void deleteRecord(Long id);
Boolean grant(Long shopId, MkRewardCouponDTO rewardCouponDTO); Boolean grant(Long shopId, MkRewardCouponDTO rewardCouponDTO, String source);
} }

2
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
View File

@@ -216,7 +216,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
shopCouponRecordService.grant(birthdayGift.getMainShopId(), new MkRewardCouponDTO().setCouponId(couponInfo.getId()) shopCouponRecordService.grant(birthdayGift.getMainShopId(), new MkRewardCouponDTO().setCouponId(couponInfo.getId())
.setNum(couponInfo.getNum()) .setNum(couponInfo.getNum())
.setUserId(shopUser.getUserId()) .setUserId(shopUser.getUserId())
.setShopId(birthdayGift.getMainShopId())); .setShopId(birthdayGift.getMainShopId()), "生日赠券");
MkBirthdayGiftRecordCoupon recordCoupon = new MkBirthdayGiftRecordCoupon().setCouponName(shopCoupon.getTitle()).setNum(couponInfo.getNum()) MkBirthdayGiftRecordCoupon recordCoupon = new MkBirthdayGiftRecordCoupon().setCouponName(shopCoupon.getTitle()).setNum(couponInfo.getNum())
.setType(TableValueConstant.BirthdayGiftRecordCoupon.Type.GIVE.getCode()) .setType(TableValueConstant.BirthdayGiftRecordCoupon.Type.GIVE.getCode())
.setRecordId(giftRecord.getId()).setUserId(shopUser.getUserId()).setShopUserId(shopUser.getId()); .setRecordId(giftRecord.getId()).setUserId(shopUser.getUserId()).setShopUserId(shopUser.getId());

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

@@ -500,14 +500,14 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
} }
@Override @Override
public Boolean grant(Long shopId, MkRewardCouponDTO rewardCouponDTO) { public Boolean grant(Long shopId, MkRewardCouponDTO rewardCouponDTO, String source) {
Long mainIdByShopId = shopInfoService.getMainIdByShopId(shopId); Long mainIdByShopId = shopInfoService.getMainIdByShopId(shopId);
ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getMainShopId, mainIdByShopId).eq(ShopUser::getUserId, rewardCouponDTO.getUserId())); ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getMainShopId, mainIdByShopId).eq(ShopUser::getUserId, rewardCouponDTO.getUserId()));
MkShopCouponGiftDTO giftDTO = new MkShopCouponGiftDTO().setCouponId(rewardCouponDTO.getCouponId()) MkShopCouponGiftDTO giftDTO = new MkShopCouponGiftDTO().setCouponId(rewardCouponDTO.getCouponId())
.setShopId(shopId) .setShopId(shopId)
.setSourceId(rewardCouponDTO.getUserId()) .setSourceId(rewardCouponDTO.getUserId())
.setShopUserId(shopUser == null ? null : shopUser.getId()) .setShopUserId(shopUser == null ? null : shopUser.getId())
.setSource("后台发放"); .setSource(source);
receiveCoupon(giftDTO, rewardCouponDTO.getNum(), false); receiveCoupon(giftDTO, rewardCouponDTO.getNum(), false);
return true; return true;
} }

2
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
View File

@@ -202,7 +202,7 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
shopCouponRecordService.grant(shopId, new MkRewardCouponDTO().setCouponId(item.getId()) shopCouponRecordService.grant(shopId, new MkRewardCouponDTO().setCouponId(item.getId())
.setNum(item.getNum()) .setNum(item.getNum())
.setUserId(shopUser.getUserId()) .setUserId(shopUser.getUserId())
.setShopId(shopId)); .setShopId(shopId), "充值赠券");
}catch (Exception e) { }catch (Exception e) {
log.warn("发放优惠券失败", e); log.warn("发放优惠券失败", e);
} }

4
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
View File

@@ -354,7 +354,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
shopCouponRecordService.grant(shopUser.getMainShopId(), new MkRewardCouponDTO().setCouponId(item.getCoupon().getId()) shopCouponRecordService.grant(shopUser.getMainShopId(), new MkRewardCouponDTO().setCouponId(item.getCoupon().getId())
.setNum(item.getNum()) .setNum(item.getNum())
.setUserId(shopUser.getUserId()) .setUserId(shopUser.getUserId())
.setShopId(shopUser.getMainShopId())); .setShopId(shopUser.getMainShopId()), "会员任务赠券");
}); });
// couponGiftService.addCouponGift(memberOrderId, "会员开通赠券", 1, giftDTOS); // couponGiftService.addCouponGift(memberOrderId, "会员开通赠券", 1, giftDTOS);
@@ -505,7 +505,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
shopCouponRecordService.grant(shopId, new MkRewardCouponDTO().setCouponId(item.getCoupon().getId()) shopCouponRecordService.grant(shopId, new MkRewardCouponDTO().setCouponId(item.getCoupon().getId())
.setNum(item.getNum()) .setNum(item.getNum())
.setUserId(shopUser.getUserId()) .setUserId(shopUser.getUserId())
.setShopId(shopId)); .setShopId(shopId), "购买会员赠券");
} catch (Exception e) { } catch (Exception e) {
log.error("发券失败", e); log.error("发券失败", e);
} }