营口分账

jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxJsjpController.java

@@ -138,7 +138,7 @@ public class WxJsjpController extends BaseController {
         order.setDqmc(gzptUserInfo.getCityName());
         order.setSchool(gzptUserInfo.getSchool());
         order.setSchoolName(gzptUserInfo.getSchoolName());
-        order.setIsShare(isShare);
+        //order.setIsShare(isShare);
         order.setCreateId(gzptUserInfo.getOutCreateId());
 
         Double price = Double.parseDouble(values[0]) * 100;   //订单总额
@@ -146,29 +146,36 @@ public class WxJsjpController extends BaseController {
         order.setTotal(b);
 
         if (isShare == 1) {
+
             //营口学员已绑定教练员
             if ("2108".equals(gzptUserInfo.getCity()) && gzptUserInfo.getIsBindCoach() == 1) {
                 //如果是合作驾校
                 if (wxOrderDTO.getPhoneType() != null && wxOrderDTO.getPhoneType() == 1) { //苹果
                     int priceApple = Integer.parseInt(values[3]);   //订单总额
                     order.setSchoolCommission(priceApple);
+                    order.setIsShare(1);
                 } else if (wxOrderDTO.getPhoneType() != null && wxOrderDTO.getPhoneType() == 2) { //安卓
                     int priceAndroid = Integer.parseInt(values[2]);   //订单总额
                     order.setSchoolCommission(priceAndroid);
+                    order.setIsShare(1);
                 }
+            } else if ("2108".equals(gzptUserInfo.getCity()) && gzptUserInfo.getIsBindCoach() != 1) {
+                order.setIsShare(0); //如果2108地区 没绑定教练，不算合作订单
             }
+
             //非营口只判断有合作
             if (!"2108".equals(gzptUserInfo.getCity())) {
                 //如果是合作驾校
                 if (wxOrderDTO.getPhoneType() != null && wxOrderDTO.getPhoneType() == 1) { //苹果
                     int priceApple = Integer.parseInt(values[3]);   //订单总额
                     order.setSchoolCommission(priceApple);
+                    order.setIsShare(1);
                 } else if (wxOrderDTO.getPhoneType() != null && wxOrderDTO.getPhoneType() == 2) { //安卓
                     int priceAndroid = Integer.parseInt(values[2]);   //订单总额
                     order.setSchoolCommission(priceAndroid);
+                    order.setIsShare(1);
                 }
             }
-
         }
 
 
@@ -388,7 +395,7 @@ public class WxJsjpController extends BaseController {
         order.setDqmc(gzptUserInfo.getCityName());
         order.setSchool(gzptUserInfo.getSchool());
         order.setSchoolName(gzptUserInfo.getSchoolName());
-        order.setIsShare(isShare);
+        //order.setIsShare(isShare);
         order.setCreateId(gzptUserInfo.getOutCreateId());
 
         Double price = Double.parseDouble(values[0]) * 100;   //订单总额
@@ -403,23 +410,29 @@ public class WxJsjpController extends BaseController {
                 if (wxOrderDTO.getPhoneType() != null && wxOrderDTO.getPhoneType() == 1) { //苹果
                     int priceApple = Integer.parseInt(values[3]);   //订单总额
                     order.setSchoolCommission(priceApple);
+                    order.setIsShare(1);
                 } else if (wxOrderDTO.getPhoneType() != null && wxOrderDTO.getPhoneType() == 2) { //安卓
                     int priceAndroid = Integer.parseInt(values[2]);   //订单总额
                     order.setSchoolCommission(priceAndroid);
+                    order.setIsShare(1);
                 }
+            } else if ("2108".equals(gzptUserInfo.getCity()) && gzptUserInfo.getIsBindCoach() != 1) {
+                order.setIsShare(0); //如果2108地区 没绑定教练，不算合作订单
             }
+
             //非营口只判断有合作
             if (!"2108".equals(gzptUserInfo.getCity())) {
                 //如果是合作驾校
                 if (wxOrderDTO.getPhoneType() != null && wxOrderDTO.getPhoneType() == 1) { //苹果
                     int priceApple = Integer.parseInt(values[3]);   //订单总额
                     order.setSchoolCommission(priceApple);
+                    order.setIsShare(1);
                 } else if (wxOrderDTO.getPhoneType() != null && wxOrderDTO.getPhoneType() == 2) { //安卓
                     int priceAndroid = Integer.parseInt(values[2]);   //订单总额
                     order.setSchoolCommission(priceAndroid);
+                    order.setIsShare(1);
                 }
             }
-
         }
 
         if (sysDictData.getDictLabel().indexOf("计时") != -1) {
@@ -438,7 +451,7 @@ public class WxJsjpController extends BaseController {
 
 
     /**
-     * 微信H5下单
+     * 微信H5下单封装
      *
      * @param order
      * @param goodsName