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