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

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

@@ -68,9 +68,9 @@ public class CustomerPayController {
         customerPay.setCp_orderstatus(2);
         customerPay.setCp_ordertype(2);
         customerPay.setOut_trade_no(params.get("orderNo"));
-        if (params.get("channel").equals("alipay_ys_qr")) {
+        if (params.get("channel").equals("alipay")) {
             customerPay.setCp_paytype("2");
-        } else if (params.get("channel").equals("wx_ys_qr")) {
+        } else if (params.get("channel").equals("wx")) {
             customerPay.setCp_paytype("1");
         } else {
             return 0;

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

@@ -12,12 +12,14 @@ import com.ygj.yuemum.domain.global.Packages;
 import com.ygj.yuemum.domain.maternitymatron.MmStock;
 import com.ygj.yuemum.domain.order.YSOrder;
 import com.ygj.yuemum.domain.order.YSOrderServiceLog;
+import com.ygj.yuemum.domain.pay.CustomerPay;
 import com.ygj.yuemum.service.bizobject.BizObjectApiService;
 import com.ygj.yuemum.service.distributionchannel.DcIntroduceLogService;
 import com.ygj.yuemum.service.distributionchannel.DcIntroducerService;
 import com.ygj.yuemum.service.distributionchannel.MiniAppService;
 import com.ygj.yuemum.service.global.PackagesService;
 import com.ygj.yuemum.service.maternitymatron.MmStockService;
+import com.ygj.yuemum.service.pay.CustomerPayService;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -37,7 +39,10 @@ public class YSOrderService {
     public static final String extracttemplateid = Constant.MDJAPIURL;
     @Autowired
     private YSOrderDao YSOrderDao;
-
+    @Autowired
+    private PackagesService packagesService;
+    @Autowired
+    private CustomerPayService customerPayService;
     @Autowired
     private MmStockDao mmStockDao;
     @Autowired
@@ -51,8 +56,6 @@ public class YSOrderService {
     @Autowired
     private YSOrderServiceLogService ysOrderServiceLogService;
     @Autowired
-    private PackagesService packagesService;
-    @Autowired
     private BizObjectApiService bizObjectApiService;
     //分页
     public Map<String, Object> getYSOrders(int page, int limit) {
@@ -122,6 +125,31 @@ public class YSOrderService {
 
 
     public YSOrder getYSOrder(Integer id) {
+        YSOrder ysOrder = YSOrderDao.selectByPrimaryKey(id);
+        //获取产品信息
+        Packages packages = packagesService.getRatioById(ysOrder.getOd_product_id());
+        float discount =   ysOrder.getOd_mgm_discount() + ysOrder.getOd_other_discount() + ysOrder.getOd_promotion_discount();
+        String ratioArray[] = packages.getPayment_steps().split(",");
+        if (ratioArray.length != 1) {
+            //获取支付信息
+            List<CustomerPay> customerPays = customerPayService.selectCustomerPay(ysOrder.getOd_no());
+            if(customerPays != null && customerPays.size() > 0) {
+                float pay_sum = 0;
+                for(CustomerPay customerPay:customerPays) {
+                    pay_sum = pay_sum + Float.parseFloat(String.valueOf(customerPay.getCp_payamount()));
+                }
+                if (customerPays.size() > ratioArray.length) {
+                    ysOrder.setOd_order_pay_amount(ysOrder.getOd_order_amount() - pay_sum);
+                } else {
+                    ysOrder.setOd_order_pay_amount(ysOrder.getOd_order_amount() * Float.parseFloat(ratioArray[customerPays.size()]));
+                }
+                if(pay_sum + ysOrder.getOd_order_pay_amount() > ysOrder.getOd_order_pay_amount()) {
+                    ysOrder.setOd_order_pay_amount(ysOrder.getOd_order_pay_amount() - pay_sum);
+                }
+            } else {
+                ysOrder.setOd_order_pay_amount((ysOrder.getOd_order_amount() - discount) * Float.parseFloat(ratioArray[0]));
+            }
+        }
         return YSOrderDao.selectByPrimaryKey(id);
     }
 

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

@@ -144,9 +144,9 @@ public class CustomerPayService {
         HttpEntity he = resp.getEntity();
         respContent = EntityUtils.toString(he, "UTF-8");
         org.json.JSONObject jsonObject = new org.json.JSONObject(respContent);
-        if (channel.equals("alipay_qr")) {
+        if (channel.equals("alipay_ys_qr")) {
             url = jsonObject.getString("body");
-        } else if (channel.equals("wx_pub_qr")) {
+        } else if (channel.equals("wx_ys_qr")) {
             url = jsonObject.getJSONObject("body").getString("codeUrl");
         } else {
             return null;

src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: dev
+    active: test