Просмотр исходного кода

fix order

release_toaliyun_real
xiaohanzi 4 лет назад
Родитель
Сommit
287bd8f2fa
4 измененных файлов: 15 добавлений и 9 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/order/OrderAdapterService.java
  3. +6
    -1
      mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java
  4. +7
    -6
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java

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

@@ -2158,7 +2158,7 @@ public class WxOrderServiceImpl implements WxOrderService {
Long orderNumber;
// 4.1 券价格
WxComposeChildOrderPrice price = orderFactory.getOrderAdapterService(composeOrder.getComposeOrderType())
.getChildCouponOrderPrice(coupon, orderdto.getSignleOrder().isPressOrder(), orderdto.getSignleOrder().getOrderGroupId(), couponNumber);
.getChildCouponOrderPrice(orderdto,coupon, orderdto.getSignleOrder().isPressOrder(), orderdto.getSignleOrder().getOrderGroupId(), couponNumber);
Integer orderStatus = OrderHelper.getOrderStatusWxCoupon(coupon, orderdto.getSignleOrder().getOrderGroupId());



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

@@ -37,7 +37,7 @@ public interface OrderAdapterService {
* @param coupon
* @return
*/
WxComposeChildOrderPrice getChildCouponOrderPrice(WxCoupon coupon,boolean isPress,Long orderGroupId,Integer couponNumber);
WxComposeChildOrderPrice getChildCouponOrderPrice(OrderComposeSaveDto orderdto,WxCoupon coupon,boolean isPress,Long orderGroupId,Integer couponNumber);
/**
* 计算每一个子订单的补贴


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

@@ -13,6 +13,7 @@ import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxOrder;
import com.iformall.domain.po.WxPayOrder;
import com.iformall.enums.EnumComposeOrder;
import com.iformall.enums.EnumOrderShopingType;
import com.iformall.enums.EnumPayWay;
import com.iformall.mapper.WxOrderMapper;
import com.iformall.service.order.OrderAdapterService;
@@ -53,9 +54,13 @@ public class SingleOrderAdapterService implements OrderAdapterService {
}
@Override
public WxComposeChildOrderPrice getChildCouponOrderPrice(WxCoupon coupon, boolean isPress, Long orderGroupId,
public WxComposeChildOrderPrice getChildCouponOrderPrice(OrderComposeSaveDto orderdto,WxCoupon coupon, boolean isPress, Long orderGroupId,
Integer couponNumber) {
Integer perPrice = OrderHelper.getCouponPerPayment(coupon, isPress, orderGroupId);
//在线配送加上运费
if (EnumOrderShopingType.DISTRIBUTION.getCode().equals(orderdto.getShippingType())) {
perPrice = perPrice + coupon.getFreightPrice();
}
return new WxComposeChildOrderPrice(perPrice, couponNumber, coupon.getId());
}


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

@@ -40,8 +40,12 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic
WxOrderMapper wxOrderMapper;

@Override
public WxComposeChildOrderPrice getChildCouponOrderPrice(WxCoupon coupon,boolean isPress,Long orderGroupId,Integer couponNumber) {
public WxComposeChildOrderPrice getChildCouponOrderPrice(OrderComposeSaveDto orderdto,WxCoupon coupon,boolean isPress,Long orderGroupId,Integer couponNumber) {
Integer perPrice = OrderHelper.getCouponPerPayment(coupon, isPress, orderGroupId);
//在线配送加上运费
if (EnumOrderShopingType.DISTRIBUTION.getCode().equals(orderdto.getShippingType())) {
perPrice = perPrice + coupon.getFreightPrice();
}
return new WxComposeChildOrderPrice(perPrice, couponNumber, coupon.getId());
}
@@ -54,12 +58,9 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic
int payment = 0;
for (OrderComposeSaveDto ocsd : orderSave) {
boolean isPress = ocsd.getSignleOrder().isPressOrder();
WxComposeChildOrderPrice price = getChildCouponOrderPrice(ocsd.getWxCoupon(), isPress, ocsd.getSignleOrder().getOrderGroupId(), ocsd.getCount());
WxComposeChildOrderPrice price = getChildCouponOrderPrice(ocsd,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());


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