新版本套餐第10次提交

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

@@ -122,21 +122,20 @@ public class WxJsjpController extends BaseController {
 
         if(isShare==1) {
             //如果是合作驾校
-            if (wxOrderDTO.getPhoneType() == 1) { //苹果
-                Double priceApple = Double.parseDouble(values[3]) * 100;   //订单总额
-                int priceAppleInt = new Double(priceApple).intValue();
-                order.setSchoolCommission(priceAppleInt);
-            } else if (wxOrderDTO.getPhoneType() == 2) { //安卓
-                Double priceAndroid = Double.parseDouble(values[2]) * 100;   //订单总额
-                int priceAndroidInt = new Double(priceAndroid).intValue();
-                order.setSchoolCommission(priceAndroidInt);
+            if (wxOrderDTO.getPhoneType()!=null && wxOrderDTO.getPhoneType()==1) { //苹果
+                int priceApple = Integer.parseInt(values[3]) *100;   //订单总额
+                order.setSchoolCommission(priceApple);
+            } else if (wxOrderDTO.getPhoneType()!=null && wxOrderDTO.getPhoneType()==2) { //安卓
+                int priceAndroid = Integer.parseInt(values[2]) * 100;   //订单总额
+                order.setSchoolCommission(priceAndroid);
             }
         }
 
-       if("理论计时".equals(sysDictData.getDictLabel())){
+
+       if(sysDictData.getDictLabel().indexOf("计时")!=-1){
            int isActiva = schActivationService.isSchActivation(gzptUserInfo.getOutId());
            if(isActiva==1){
-               throw new CustomException("该学员已激活，请勿重复操作");
+               throw new CustomException("该学员已激活，请退出APP后再重新获取套餐");
            }
        }
 

jsjp-admin/src/main/resources/application-dev.yml

@@ -125,8 +125,8 @@ wxpay:
     merchantId: 1611324484
     serialNumber: 53EBF541F383371B121D7B57B25305FC0BB04F42
     v3key: 7hM14893GvG3JK05575jk1l6P4tF042B
-    notifyUrl: http://218.85.55.253:8888/open-api/wx/notify/wxpay
-    notifyUrlRefund: http://218.85.55.253:8888/open-api/wx/notify/refund
+    notifyUrl: http://175.42.30.21:8888/open-api/wx/notify/wxpay
+    notifyUrlRefund: http://175.42.30.21:8888/open-api/wx/notify/refund
 
 # 苹果支付
 applepay:

jsjp-service/src/main/java/com/miaxis/order/domain/OrderInfo.java

@@ -110,13 +110,13 @@ public class OrderInfo extends BaseBusinessEntity{
     @Excel(name = "驾校提成")
     @TableField("school_commission")
     @ApiModelProperty(value = "驾校提成")
-    private int schoolCommission;
+    private Integer schoolCommission;
 
     /** 手机类型 1:苹果 2:安卓 */
     @Excel(name = "手机类型 1:苹果 2:安卓")
     @TableField("phone_type")
     @ApiModelProperty(value = "手机类型 1:苹果 2:安卓")
-    private int phoneType;
+    private Integer phoneType;
 
 
 }

jsjp-service/src/main/java/com/miaxis/wx/domain/WxJsOrder.java

@@ -182,7 +182,7 @@ public class WxJsOrder extends BaseBusinessEntity{
     @Excel(name = "驾校提成")
     @TableField("school_commission")
     @ApiModelProperty(value = "驾校提成")
-    private int schoolCommission;
+    private Integer schoolCommission;
 
     /** 手机类型 1:苹果 2:安卓 */
     @Excel(name = "手机类型 1:苹果 2:安卓")