提交代码

yy_dev
胡锐 1 year ago
parent 1ea12fd0fb
commit df34abef57
  1. 2
      service/src/main/java/com/hfkj/channel/lakala/LaKaLaTradeSeparateService.java
  2. 3
      service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java

@ -72,11 +72,13 @@ public class LaKaLaTradeSeparateService {
Map<String,Object> recvDatasMap; Map<String,Object> recvDatasMap;
for (BsTradeOrderProfitSharingReceiver receiver : profitSharingReceiverList) { for (BsTradeOrderProfitSharingReceiver receiver : profitSharingReceiverList) {
if (receiver.getReceiverAmount().compareTo(new BigDecimal("0")) != 0) {
recvDatasMap = new HashMap<>(); recvDatasMap = new HashMap<>();
recvDatasMap.put("recv_no", receiver.getReceiverAccount()); recvDatasMap.put("recv_no", receiver.getReceiverAccount());
recvDatasMap.put("separate_value", receiver.getReceiverAmount().multiply(new BigDecimal("100")).longValue()); recvDatasMap.put("separate_value", receiver.getReceiverAmount().multiply(new BigDecimal("100")).longValue());
recvDatasMapList.add(recvDatasMap); recvDatasMapList.add(recvDatasMap);
} }
}
map.put("recv_datas", recvDatasMapList); map.put("recv_datas", recvDatasMapList);
commonParam.put("req_data", map); commonParam.put("req_data", map);

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

Loading…
Cancel
Save