下单修改

sdjk-admin/src/main/java/com/miaxis/app/controller/wx/WxController.java

@@ -102,8 +102,12 @@ public class WxController extends BaseController {
      */
     @PostMapping(value = "/prepareOrder")
     @ApiOperation("app端微信支付下单")
-    public Response<WxParamEntity> getPrepareOrder(@RequestParam @ApiParam(name="type",value="1-超级vip 2-普通vip 3-升级高级vip",required=true)Integer type) throws Exception{
+    public Response<WxParamEntity> getPrepareOrder(@RequestParam @ApiParam(name="type",value="1-超级vip 2-普通vip 3-升级高级vip")Integer type) throws Exception{
 
+        //兼容线上，app上线后删除
+        if (type == null){
+            type = 1;
+        }
         //创建本地微信订单
         WxOrder order = new WxOrder();
         UserInfo student = SecurityUtils.getLoginUser().getStudent();
@@ -115,7 +119,7 @@ public class WxController extends BaseController {
         SysConfig config = sysConfigService.selectConfigObjByKey(key);
         String goodsName = config.getConfigName();
         order.setGoodsName(goodsName);
-        order.setOrderDataJson(type.toString());
+        order.setOrderDataJson(Integer.valueOf(type).toString());
         wxOrderService.createVipOrder(order,type);
         wxOrderService.save(order);