|
|
|
@ -108,9 +108,11 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService { |
|
|
|
|
tradeOrder.setTradeActualAmount(tradeAmount); |
|
|
|
|
tradeOrder.setStoreDiscountSatisfy(false); |
|
|
|
|
tradeOrder.setUserPhone(userPhone); |
|
|
|
|
tradeOrder.setProfitSharingStatus(false); |
|
|
|
|
|
|
|
|
|
// 门店优惠
|
|
|
|
|
if (storeDiscount != null) { |
|
|
|
|
tradeOrder.setProfitSharingStatus(true); |
|
|
|
|
tradeOrder.setStoreDiscountId(storeDiscount.getId()); |
|
|
|
|
tradeOrder.setStoreDiscountName(storeDiscount.getName()); |
|
|
|
|
tradeOrder.setStoreDiscountType(storeDiscount.getDiscountType()); |
|
|
|
@ -199,7 +201,6 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService { |
|
|
|
|
tradeOrder.setQrCodeId(MapUtils.getLong(param, "qrCodeId")); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
tradeOrder.setProfitSharingStatus(false); |
|
|
|
|
editOrder(tradeOrder); |
|
|
|
|
|
|
|
|
|
Map<String, Object> returnParam = new HashMap<>(); |
|
|
|
|