|
@@ -918,7 +918,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
add.setCreateTime(DateUtils.getNowTime());
|
|
add.setCreateTime(DateUtils.getNowTime());
|
|
add.setUpdateTime(DateUtils.getNowTime());
|
|
add.setUpdateTime(DateUtils.getNowTime());
|
|
add.setOrderType(Order.CONSUME_ORDER);
|
|
add.setOrderType(Order.CONSUME_ORDER);
|
|
- add.setOrderFrom(11);
|
|
|
|
add.setHandleOrderSn(bo.getHandleOrderSn());
|
|
add.setHandleOrderSn(bo.getHandleOrderSn());
|
|
if(orderHandle.getPayType()==1){
|
|
if(orderHandle.getPayType()==1){
|
|
add.setPayType(1);
|
|
add.setPayType(1);
|
|
@@ -1039,11 +1038,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
}
|
|
}
|
|
|
|
|
|
add.setOrderSn(out_trade_no);
|
|
add.setOrderSn(out_trade_no);
|
|
- if (Validator.isNotEmpty(bo.getOrderFrom()) && bo.getOrderFrom() == 6) {
|
|
|
|
- add.setOrderFrom(bo.getOrderFrom());
|
|
|
|
- } else {
|
|
|
|
- add.setOrderFrom(Order.FROM_INPUT);
|
|
|
|
- }
|
|
|
|
|
|
+ add.setOrderFrom(11);
|
|
add.setPayPrice(payPrice);//需要支付价格
|
|
add.setPayPrice(payPrice);//需要支付价格
|
|
add.setOrderPrice(totalPrice);//标准价格
|
|
add.setOrderPrice(totalPrice);//标准价格
|
|
orderHandle.setPayPrice(orderHandle.getPayPrice().add(payPrice));
|
|
orderHandle.setPayPrice(orderHandle.getPayPrice().add(payPrice));
|