Browse Source

[C端领取券记录couponActionLog][新增]:C端领取券记录到couponActionLog,order_id->coupon_order_id,coupon_channel_id->channel_id

release_toaliyun_real
Stormeye.Wu 7 years ago
parent
commit
da33cf73fd
3 changed files with 17 additions and 7 deletions
  1. +3
    -5
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxOrderService.java
  3. +13
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 3
- 5
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java View File

@@ -91,15 +91,13 @@ public class WxOrderController extends BaseController {
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
String couponChannelIdStr = paramMap.get("couponChannelId");
String couponIdStr = paramMap.get("couponId");
/*
// TODO 修改支持banner图,获取不到couponChannelId问题

if (StringUtils.isBlank(couponChannelIdStr)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId不能为空");
}
*/
Long couponChannelId = 0L, couponId = 0L;

if (!StringUtils.isBlank(couponChannelIdStr)) {
if (StringUtils.isNotBlank(couponChannelIdStr)) {
try {
couponChannelId = Long.valueOf(couponChannelIdStr);
} catch (NumberFormatException e) {
@@ -136,7 +134,7 @@ public class WxOrderController extends BaseController {
WxCUser user = getUser();

try {
WxOrder order = wxOrderService.saveOrder(user, couponId);
WxOrder order = wxOrderService.saveOrder(user, couponChannelId, couponId);
return new ResultData(order);
} catch (MallinkException e) {
logger.error(e.getMessage());


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxOrderService.java View File

@@ -29,7 +29,7 @@ public interface WxOrderService {
* @param couponId
* @return 订单id
*/
WxOrder saveOrder(WxCUser user, Long couponId);
WxOrder saveOrder(WxCUser user, Long couponChannelId, Long couponId);

/**
* 免费券订单接口


+ 13
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -69,6 +69,9 @@ public class WxOrderServiceImpl implements WxOrderService {
@Autowired
WxCUserTagsService wxCUserTagsService;

@Autowired
WxCouponActionLogService wxCouponActionLogService;

@Override
public PageInfo<WxOrder> listAsPage(WxOrder record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record));
@@ -209,7 +212,7 @@ public class WxOrderServiceImpl implements WxOrderService {

@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public WxOrder saveOrder(WxCUser user, Long couponId) {
public WxOrder saveOrder(WxCUser user, Long couponChannelId, Long couponId) {
// 检查用户
if (user == null) {
logger.error("用户不存在");
@@ -283,6 +286,15 @@ public class WxOrderServiceImpl implements WxOrderService {
throw new MallinkException(ErrorCode.ORDER_SAVE_ERR);
}

// couponActionLog
try {
wxCouponActionLogService.addOne(user.getTenantId(), couponId, orderNumber, EnumCouponSendSendType.ACTIVE.getCode(), couponChannelId);
} catch (Exception e) {
logger.error("保存订单:" + e.getMessage());
throw new MallinkException(ErrorCode.ORDER_SAVE_ERR);
}


return record;
}



Loading…
Cancel
Save