财务信息页面调整

src/main/java/com/caimei/modules/order/service/NewShopOrderService.java

@@ -486,6 +486,13 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
                 if (newShopOrder.getShouldPayShopAmount() != null) {
                     shouldPayShopAmount += newShopOrder.getShouldPayShopAmount();
                 }
+                //订单应付金额加入差价计算
+                if(null!=newShopOrder.getDifferenceType()&&1==newShopOrder.getDifferenceType()){
+                    shouldPayShopAmount += newShopOrder.getDifferencePrice().doubleValue();
+                }
+                if(null!=newShopOrder.getDifferenceType()&&2==newShopOrder.getDifferenceType()){
+                    shouldPayShopAmount -= newShopOrder.getDifferencePrice().doubleValue();
+                }
                 // 供应商已退金额
                 Double collect = 0d;
                 List<CmRefundShopRecord> records = cmRefundShopRecordDao.getRefundedRecords(String.valueOf(newShopOrder.getShopOrderID()));