|
|
@@ -155,6 +155,11 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
|
|
|
for (NewShopOrder so : payOrderList) {
|
|
|
totalAmount += ((so.getShouldPayShopAmount() == null ? 0D : so.getShouldPayShopAmount()) -
|
|
|
(so.getPayedShopAmount() == null ? 0D : so.getPayedShopAmount()));
|
|
|
+ if (so.getDifferenceType() != null && so.getDifferenceType() == 1) {
|
|
|
+ totalAmount = MathUtil.add(totalAmount, so.getDifferencePrice()).doubleValue();
|
|
|
+ } else if (so.getDifferenceType() != null && so.getDifferenceType() == 2) {
|
|
|
+ totalAmount = MathUtil.sub(totalAmount, so.getDifferencePrice()).doubleValue();
|
|
|
+ }
|
|
|
List<NewOrderProduct> orderProductList = newOrderProductDao.findByShopOrderID(so.getShopOrderID());
|
|
|
/*
|
|
|
1. 若发生退货，数量要减去已退货和已取消的数量
|
plf