|
@@ -194,13 +194,14 @@ public class WxOrderServiceImpl implements WxOrderService {
|
|
|
|
|
|
BigDecimal freight = new BigDecimal(0);
|
|
|
BigDecimal discount = new BigDecimal(0);
|
|
|
+// discount = wxOrderDate.getCouponPrice();
|
|
|
wxOrder.setFreight(freight);
|
|
|
wxOrder.setDiscount(discount);
|
|
|
|
|
|
wxOrder.setActuralPaid(wxOrderDate.getActuralPaid());
|
|
|
|
|
|
wxOrder.setExprType(cus.getWaybill().get("exprType"));
|
|
|
- if (!CcnetContants.wsFlag.item_00.getItem().equals(wxOrderDate.getWsFlag())) {
|
|
|
+ if (!CcnetContants.wsFlag.item_10.getItem().equals(wxOrderDate.getWsFlag())) {
|
|
|
wxOrder.setExprCompId(cus.getWaybill().get("exprComrId"));
|
|
|
} else {
|
|
|
wxOrder.setExprCompId("emato");
|