|
|
@@ -145,7 +145,7 @@ public class SubmitOrderListener {
|
|
|
//这个运费是已经算过的了
|
|
|
double actualTotal = shopCartOrderDto.getActualTotal();
|
|
|
//企业用户才进这个判断,并且该用户的积分必须大于0
|
|
|
- if (1 == mergerOrder.getChannelId() && null != point && point > 0) {
|
|
|
+ if (null != point && point > 0) {
|
|
|
order.setOrderType(OrderType.SCORE.value());
|
|
|
// 计算商品金额和积分
|
|
|
Double mul = Arith.mul(actualTotal, 100);
|
|
|
@@ -199,7 +199,7 @@ public class SubmitOrderListener {
|
|
|
orderItem.setPlatformShareReduce(shopCartItem.getPlatformShareReduce());
|
|
|
Double actualItem = shopCartItem.getActualTotal();
|
|
|
//后台充值的积分
|
|
|
- if (1 == mergerOrder.getChannelId() && null != point && point > 0) {
|
|
|
+ if (null != point && point > 0) {
|
|
|
Double useActualItem = actualItem;
|
|
|
if (!isUseTransfee) {//每个订单增加运费,都只扣一次
|
|
|
Double transfee = shopCartOrderDto.getTransfee();
|