Просмотр исходного кода

Merge branch 'release_toaliyun_real_2022_init' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_2022_init

release_toaliyun_real
winter 4 лет назад
Родитель
Сommit
a6b1ff5536
2 измененных файлов: 12 добавлений и 1 удалений
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java
  2. +11
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 1
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java Просмотреть файл

@@ -201,6 +201,7 @@ public class WxOrderCouponVo extends TenantEntity {
this.setDetail(c.getDetail());
this.setRemark(c.getRemark());
this.setGiftList(c.getGiftList());
this.setGiftCouponList(c.getGiftCouponList());
this.setSupportTransfer(c.getSupportTransfer());
this.setSubsidyNum(c.getSubsidyNum());
}


+ 11
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Просмотреть файл

@@ -2242,6 +2242,15 @@ public class WxOrderServiceImpl implements WxOrderService {
couponQ.setId(order.getProductId());
WxCoupon coupon = wxCouponMapper.findSimpleDetail(couponQ);
if (null != coupon ) {
if(EnumCouponType.COUPON_GIFT.getCode().equals(coupon.getType())){
WxCoupon couponGQ = new WxCoupon();
couponGQ.updateTenantInfo(tenantEntity);
List<Long> longs = JSON.parseArray(coupon.getGiftList(), Long.class);
if(longs != null && longs.size() > 0){
couponGQ.setIds(longs);
coupon.setGiftCouponList(wxCouponMapper.findList(couponGQ));
}
}
vo.initByCoupon(coupon, true);
}
WxCouponOrder couponOrderQ = new WxCouponOrder();
@@ -2252,6 +2261,7 @@ public class WxOrderServiceImpl implements WxOrderService {
WxCouponOrder couponOrder = wxCouponOrderMapper.findDetailOfCUser(couponOrderList.get(0).getId(), tenantEntity.getTenantId());
vo.initByCouponOrder(couponOrder);
}
vo.setMerchantVoList(wxMerchantService.findMerchantListByProduct(tenantEntity, order.getProductId(), false));
voList.add(vo);
}
return voList;
@@ -3078,7 +3088,7 @@ public class WxOrderServiceImpl implements WxOrderService {
recordQ.updateTenantInfo(border);
recordQ.setComposeOrderId(wxBatchOrder.getId());
List<WxOrder> listOfCUser = wxOrderMapper.findListOfCUser(recordQ);
List<WxOrderCouponVo> wxOrderCouponVos = toOrderCouponVoList(border, listOfCUser, true);
List<WxOrderCouponVo> wxOrderCouponVos = toWxOrderCouponVoList(border, listOfCUser);
wxBatchOrder.setOrders(wxOrderCouponVos);
}
return wxBatchOrder;


Загрузка…
Отмена
Сохранить