Commit 1dd93e32 by 刘鹏飞

Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa

parents 37c31995 dbaac3cb
......@@ -160,6 +160,7 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
if(OrderAccountType.COUPON.getCode().equals(orderAccountType) && "0".equals(orderSettlementInfo.get(0).getProductId())){
// 整单代金券,最后在计算
orderSettlementRemain.add(orderSettlementInfo.get(0));
continue;
}
CouponCodeVerificationTransDto couponCodeVerificationTransDto = new CouponCodeVerificationTransDto();
......
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