Merge branch 'master' of http://git.yueguanjia.com/alpha/ygj-yuemum

src/main/java/com/ygj/yuemum/controller/pay/CustomerPayController.java

@@ -68,15 +68,15 @@ public class CustomerPayController {
         customerPay.setCp_orderstatus(2);
         customerPay.setCp_ordertype(2);
         customerPay.setOut_trade_no(params.get("orderNo"));
-        if (params.get("channel").equals("alipay")) {
+        if (params.get("payType").equals("alipay")) {
             customerPay.setCp_paytype("2");
-        } else if (params.get("channel").equals("wx")) {
+        } else if (params.get("payType").equals("wx")) {
             customerPay.setCp_paytype("1");
         } else {
             return 0;
         }
         customerPay.setPayment_steps(Integer.parseInt(orderNo[1]));
-        customerPay.setCp_payamount(Double.parseDouble(params.get("price")));
+        customerPay.setCp_payamount(Double.parseDouble(params.get("totalFee")));
         return  customerPayService.insertCustomerPay(customerPay);
     }
 

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

@@ -150,7 +150,7 @@ public class YSOrderService {
                 ysOrder.setOd_order_pay_amount((ysOrder.getOd_order_amount() - discount) * Float.parseFloat(ratioArray[0]));
             }
         }
-        return YSOrderDao.selectByPrimaryKey(id);
+        return ysOrder;
     }
 
     public YSOrder selectByOdNo(String od_no) {