zhijiezhao 3 年之前
父節點
當前提交
9ea22f439c

+ 4 - 0
src/main/java/com/caimei365/order/model/po/OrderPo.java

@@ -17,6 +17,10 @@ public class OrderPo implements Serializable {
      * orderSeen:订单对机构可见度,1可见,2不可见
      */
     private Integer orderSeen;
+    /**
+     * 经理折扣
+     */
+    private Integer discountFee;
     /**
      * 订单号
      */

+ 3 - 0
src/main/java/com/caimei365/order/service/impl/HeliPayServiceImpl.java

@@ -1173,6 +1173,9 @@ public class HeliPayServiceImpl implements HeliPayService {
                 }
             });
             shopOrder.setObligation(MathUtil.sub(shopOrder.getRealPay(), shopOrder.getReceiptAmount()).doubleValue());
+            if(998==shopOrder.getShopId()){
+                shopOrder.setObligation(shopOrder.getTotalAmount());
+            }
             shopOrder.setOrderProductList(orderProductList);
             shopOrder.setShopLogo(ImageUtil.getImageUrl("shopLogo", shopOrder.getShopLogo(), domain));
         });