新版本套餐第9次提交

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

@@ -136,7 +136,7 @@ public class WxJsjpController extends BaseController {
        if("理论计时".equals(sysDictData.getDictLabel())){
            int isActiva = schActivationService.isSchActivation(gzptUserInfo.getOutId());
            if(isActiva==1){
-               throw new CustomException("该学员已激活，请勿重复操作",500);
+               throw new CustomException("该学员已激活，请勿重复操作");
            }
        }
 

jsjp-admin/src/main/java/com/miaxis/pc/PcOrderInfoController.java

@@ -93,7 +93,9 @@ public class PcOrderInfoController extends BaseController{
         String refundCode = getOrderCode(null);
         WxJsOrder order = wxJsOrderService.getByOutTradeNo(outTradeNo);
         refundRecordService.refund(order,refundCode,"极速驾培退款");
-        //todo 取消会员
+        //TODO 取消会员
+
+
         return Response.success();
     }
 

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

@@ -188,6 +188,6 @@ public class WxJsOrder extends BaseBusinessEntity{
     @Excel(name = "手机类型 1:苹果 2:安卓")
     @TableField("phone_type")
     @ApiModelProperty(value = "手机类型 1:苹果 2:安卓")
-    private int phoneType;
+    private Integer phoneType;
 
 }