xiaohanzi 4 лет назад
Родитель
Сommit
6dbed7cc3c
2 измененных файлов: 6 добавлений и 1 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  2. +5
    -0
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Просмотреть файл

@@ -2169,7 +2169,7 @@ public class WxOrderServiceImpl implements WxOrderService {
record.setOrderGroupId(orderdto.getSignleOrder().getOrderGroupId()); record.setOrderGroupId(orderdto.getSignleOrder().getOrderGroupId());
record.setFormId(orderdto.getSignleOrder().getFormId()); record.setFormId(orderdto.getSignleOrder().getFormId());


record.setPayment(price.getRealPayMent()+coupon.getFreightPrice());//加运费
record.setPayment(price.getRealPayMent());
record.setFreightPrice(coupon.getFreightPrice()); record.setFreightPrice(coupon.getFreightPrice());


record.setShippingType(orderdto.getShippingType()); record.setShippingType(orderdto.getShippingType());


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java Просмотреть файл

@@ -17,6 +17,7 @@ import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxOrder;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumComposeOrder; import com.iformall.enums.EnumComposeOrder;
import com.iformall.enums.EnumOrderShopingType;
import com.iformall.enums.EnumPayWay; import com.iformall.enums.EnumPayWay;
import com.iformall.mapper.WxBatchOrderMapper; import com.iformall.mapper.WxBatchOrderMapper;
import com.iformall.mapper.WxOrderMapper; import com.iformall.mapper.WxOrderMapper;
@@ -55,6 +56,10 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic
boolean isPress = ocsd.getSignleOrder().isPressOrder(); boolean isPress = ocsd.getSignleOrder().isPressOrder();
WxComposeChildOrderPrice price = getChildCouponOrderPrice(ocsd.getWxCoupon(), isPress, ocsd.getSignleOrder().getOrderGroupId(), ocsd.getCount()); WxComposeChildOrderPrice price = getChildCouponOrderPrice(ocsd.getWxCoupon(), isPress, ocsd.getSignleOrder().getOrderGroupId(), ocsd.getCount());
payment = payment+price.getRealPayMent(); payment = payment+price.getRealPayMent();
//在线配送加上运费
if (EnumOrderShopingType.DISTRIBUTION.getCode().equals(ocsd.getShippingType())) {
payment = payment + ocsd.getWxCoupon().getFreightPrice();
}
} }
order.setPayment(payment); order.setPayment(payment);
order.setCreateDate(new Date()); order.setCreateDate(new Date());


Загрузка…
Отмена
Сохранить