|
@@ -206,7 +206,7 @@ public class StoreOrderController extends AppBaseController {
|
|
|
else if(param.getPayType().equals(2)){
|
|
|
order.setPayType(2);
|
|
|
BigDecimal payMoney=order.getPayPrice().multiply(new BigDecimal(storeConfig.getPayRate())).divide(new BigDecimal(100));
|
|
|
- payMoney=new BigDecimal(payMoney.setScale(0, BigDecimal.ROUND_HALF_UP).longValue());
|
|
|
+ payMoney=new BigDecimal(payMoney.setScale(2, BigDecimal.ROUND_HALF_UP).longValue());
|
|
|
order.setPayDelivery(order.getPayPrice().subtract(payMoney));
|
|
|
order.setPayMoney(payMoney);
|
|
|
}
|
|
@@ -214,7 +214,8 @@ public class StoreOrderController extends AppBaseController {
|
|
|
else if(param.getPayType().equals(3)){
|
|
|
order.setPayType(3);
|
|
|
order.setPayDelivery(order.getPayPrice() );
|
|
|
- order.setPayMoney(BigDecimal.ZERO);
|
|
|
+ // 20元邮费
|
|
|
+ order.setPayMoney(BigDecimal.valueOf(20.0));
|
|
|
}
|
|
|
orderService.updateFsStoreOrder(order);
|
|
|
return R.ok().put("order",order);
|