支付问题修改

src/main/java/com/ygj/yuemum/service/order/YSOrderService.java

@@ -328,17 +328,6 @@ public class YSOrderService {
             } else {
                 //支付尾款时第三次调用CRM接口
                 ysOrder.setOd_balancepay(ysOrder.getOd_order_pay_amount());
-                if (od_stauts == 3) {
-                    ysOrder.setOd_order_pay_amount((float) 0);
-                } else {
-                    ysOrder.setOd_order_pay_amount(
-                            ysOrder.getOd_order_amount() -
-                                    ysOrder.getOd_mgm_discount() -
-                                    ysOrder.getOd_promotion_discount() -
-                                    ysOrder.getOd_other_discount() -
-                                    ysOrder.getOd_order_pay_amount() -
-                                    ysOrder.getOd_earnestpay());
-                }
                 if (ysOrder.getOd_introducer_phone() != null) { //当有介绍人的时候
                     //回调CRM进行记录
                     HttpPost httpPost = new HttpPost(extracttemplateid);
@@ -398,9 +387,20 @@ public class YSOrderService {
                     }
                 }
             }
+            if (od_stauts == 3) {
+                ysOrder.setOd_order_pay_amount((float) 0);
+            } else {
+                ysOrder.setOd_order_pay_amount(
+                        ysOrder.getOd_order_amount() -
+                                ysOrder.getOd_mgm_discount() -
+                                ysOrder.getOd_promotion_discount() -
+                                ysOrder.getOd_other_discount() -
+                                ysOrder.getOd_order_pay_amount() -
+                                ysOrder.getOd_earnestpay());
+            }
             // 更新订单状态,修改订单待付金额
             ysOrder.setOd_status(od_stauts);
-            ysOrder.setOd_order_pay_amount(Float.parseFloat(String.valueOf(amount)));
+//            ysOrder.setOd_order_pay_amount(Float.parseFloat(String.valueOf(amount)));
             YSOrderDao.updateYsOrderStatus(ysOrder);
             //氚云调用
 //            bizObjectApiService.createSecondPay(ysOrder,payName);

src/main/java/com/ygj/yuemum/service/pay/CustomerPayService.java

@@ -126,7 +126,6 @@ public class CustomerPayService {
             BigDecimal psy_sum = new BigDecimal(String.valueOf(customerPayDao.queryPaySumByOrderNo(customerPay.getCp_orderno())));
             BigDecimal customer_pay = new BigDecimal(String.valueOf(customerPay.getCp_payamount()));
             BigDecimal data2 = psy_sum.add(customer_pay);
-//            customerPay.setCp_payamount(data2.doubleValue()); ???
             if (data1.compareTo(data2) == 0) {
                 customerPay.setCp_orderstatus(3);
             }