Commit 1a93f272 authored by wp's avatar wp

修改店铺名称不一致问题

parent a8e5415a
...@@ -108,6 +108,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements ...@@ -108,6 +108,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
private final IRedisService redisService; private final IRedisService redisService;
private final IOrderBindBoxService orderBindBoxService; private final IOrderBindBoxService orderBindBoxService;
private final MerchantIntegralMapper merchantIntegralMapper; private final MerchantIntegralMapper merchantIntegralMapper;
private final IShopService shopService;
@Autowired @Autowired
private ChainUtil chainUtil; private ChainUtil chainUtil;
...@@ -144,8 +145,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements ...@@ -144,8 +145,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
orderVO.setPayType(orderPay.getPayType()); orderVO.setPayType(orderPay.getPayType());
orderVO.setPayTime(orderPay.getPayTime()); orderVO.setPayTime(orderPay.getPayTime());
Merchant info = merchantService.info(merchantId); Merchant info = merchantService.info(merchantId);
if (info != null) { Shop shop = shopService.getByMerchantId(merchantId);
orderVO.setEnterpriseName(info.getEnterpriseName()); if (shop != null) {
orderVO.setEnterpriseName(shop.getShopName());
} }
orderVO.setMerchantId(merchantId); orderVO.setMerchantId(merchantId);
GoodsPromotion promotion = promotionService.getByOid(oid); GoodsPromotion promotion = promotionService.getByOid(oid);
...@@ -1203,11 +1205,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements ...@@ -1203,11 +1205,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
/** /**
* 用积分支付时,生成积分支付流水记录 * 用积分支付时,生成积分支付流水记录
*
* @param oid * @param oid
*/ */
private void saveOrderIntegralRecord(String oid) { private void saveOrderIntegralRecord(String oid) {
Pay pay = payService.readByOid(oid); Pay pay = payService.readByOid(oid);
if(pay.getPayType() != Pay.PAY_TYPE_INTEGRAL){ if (pay.getPayType() != Pay.PAY_TYPE_INTEGRAL) {
return; 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