Commit e0813902 authored by wlx@33.cn's avatar wlx@33.cn

Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev

parents bca5d67d 9e1cfafd
......@@ -108,6 +108,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
private final IRedisService redisService;
private final IOrderBindBoxService orderBindBoxService;
private final MerchantIntegralMapper merchantIntegralMapper;
private final IShopService shopService;
@Autowired
private ChainUtil chainUtil;
......@@ -144,8 +145,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
orderVO.setPayType(orderPay.getPayType());
orderVO.setPayTime(orderPay.getPayTime());
Merchant info = merchantService.info(merchantId);
if (info != null) {
orderVO.setEnterpriseName(info.getEnterpriseName());
Shop shop = shopService.getByMerchantId(merchantId);
if (shop != null) {
orderVO.setEnterpriseName(shop.getShopName());
}
orderVO.setMerchantId(merchantId);
GoodsPromotion promotion = promotionService.getByOid(oid);
......@@ -1203,11 +1205,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
/**
* 用积分支付时,生成积分支付流水记录
*
* @param oid
*/
private void saveOrderIntegralRecord(String oid) {
Pay pay = payService.readByOid(oid);
if(pay.getPayType() != Pay.PAY_TYPE_INTEGRAL){
if (pay.getPayType() != Pay.PAY_TYPE_INTEGRAL) {
return;
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment