Merge remote-tracking branch 'origin/dev' into dev

pz-applet/src/main/java/com/pz/applet/AppletArticleController.java

 package com.pz.applet;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pz.applet.util.CityIdUtils;
 import com.pz.common.annotation.Log;
 import com.pz.common.annotation.RepeatSubmit;
 import com.pz.common.core.controller.BaseController;
@@ -49,7 +50,7 @@ public class AppletArticleController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo<ArticleVo> list(ArticleBo bo, PageQuery pageQuery, HttpServletRequest reques) {
-        bo.setCityId(Integer.parseInt(reques.getHeader("city_id")));
+        bo.setCityId(CityIdUtils.setCityIdPasInteger(reques));
         return iArticleService.queryPageListByApp(bo, pageQuery);
     }
 

pz-applet/src/main/java/com/pz/applet/AppletEmployeesController.java

 package com.pz.applet;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pz.applet.util.CityIdUtils;
 import com.pz.common.annotation.Log;
 import com.pz.common.annotation.RepeatSubmit;
 import com.pz.common.core.controller.BaseController;
@@ -76,7 +77,7 @@ public class AppletEmployeesController extends BaseController {
     @RepeatSubmit()
     @PostMapping("/add")
     public R<Void> add(@Validated(AddGroup.class) @RequestBody EmployeesCompanyBo bo, HttpServletRequest reques) {
-        bo.setCityId(Integer.parseInt(reques.getHeader("city_id")));
+        bo.setCityId(CityIdUtils.setCityIdPasInteger(reques));
         bo.setUid(LoginHelper.getLoginUser().getUserId().intValue());
         return toAjax(iEmployeesService.insertByEmployeesCompanyBo(bo));
     }

pz-applet/src/main/java/com/pz/applet/AppletHospitalController.java

 package com.pz.applet;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pz.applet.util.CityIdUtils;
 import com.pz.common.annotation.Log;
 import com.pz.common.annotation.RepeatSubmit;
 import com.pz.common.core.controller.BaseController;
@@ -44,7 +45,7 @@ public class AppletHospitalController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo<HospitalVo> list(HospitalBo bo, PageQuery pageQuery, HttpServletRequest reques) {
-        bo.setCityId(Integer.parseInt(reques.getHeader("city_id")));
+        bo.setCityId(CityIdUtils.setCityIdPasInteger(reques));
         return iHospitalService.queryPageList(bo, pageQuery);
     }
 

pz-applet/src/main/java/com/pz/applet/AppletInformationController.java

 package com.pz.applet;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pz.applet.util.CityIdUtils;
 import com.pz.common.annotation.Log;
 import com.pz.common.annotation.RepeatSubmit;
 import com.pz.common.core.controller.BaseController;
@@ -44,7 +45,7 @@ public class AppletInformationController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo<InformationVo> list(InformationBo bo, PageQuery pageQuery, HttpServletRequest reques) {
-        bo.setCityId(Long.parseLong(reques.getHeader("city_id")));
+        bo.setCityId(CityIdUtils.setCityIdPasLong(reques));
         return iInformationService.queryPageList(bo, pageQuery);
     }
 

pz-applet/src/main/java/com/pz/applet/AppletStoreApplyController.java

 package com.pz.applet;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pz.applet.util.CityIdUtils;
 import com.pz.common.annotation.Log;
 import com.pz.common.annotation.RepeatSubmit;
 import com.pz.common.core.controller.BaseController;
@@ -47,7 +48,7 @@ public class AppletStoreApplyController extends BaseController {
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody StoreApplyBo bo, HttpServletRequest reques)
     {
-        bo.setCityId(Integer.parseInt(reques.getHeader("city_id")));
+        bo.setCityId(CityIdUtils.setCityIdPasInteger(reques));
         bo.setUid(LoginHelper.getLoginUser().getUserId().intValue());
         return toAjax(iStoreApplyService.insertByBo(bo));
     }

pz-applet/src/main/java/com/pz/applet/AppletStoreGoodsController.java

 package com.pz.applet;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pz.applet.util.CityIdUtils;
 import com.pz.common.annotation.Log;
 import com.pz.common.annotation.RepeatSubmit;
 import com.pz.common.core.controller.BaseController;
@@ -46,7 +47,7 @@ public class AppletStoreGoodsController extends BaseController {
      */
     @GetMapping("/shopList")
     public TableDataInfo<StoreGoodsVo> shopList(StoreGoodsBo bo, PageQuery pageQuery, HttpServletRequest reques) {
-        bo.setCityId(Long.parseLong(reques.getHeader("city_id")));
+        bo.setCityId(CityIdUtils.setCityIdPasLong(reques));
         return iStoreGoodsService.shopAppShop(bo, pageQuery);
     }
     /**

pz-applet/src/main/java/com/pz/applet/AppletTotalOrderController.java

@@ -2,6 +2,7 @@ package com.pz.applet;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaIgnore;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
@@ -10,6 +11,7 @@ import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
 import com.github.binarywang.wxpay.bean.result.BaseWxPayResult;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
+import com.pz.applet.util.CityIdUtils;
 import com.pz.common.annotation.Log;
 import com.pz.common.annotation.RepeatSubmit;
 import com.pz.common.core.controller.BaseController;
@@ -94,10 +96,11 @@ public class AppletTotalOrderController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<TotalOrderVo> add(@Validated(AddGroup.class) @RequestBody CreateOrderBo bo, HttpServletRequest reques) {
-        bo.setCityId(Integer.parseInt(reques.getHeader("city_id")));
+        bo.setCityId(CityIdUtils.setCityIdPasInteger(reques));
         return R.ok(iTotalOrderService.createOrder(bo));
     }
 
+
     /**
      * 修改总订单
      */

pz-applet/src/main/java/com/pz/applet/util/CityIdUtils.java

+package com.pz.applet.util;
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class CityIdUtils {
+    /**
+     * String
+     * @param reques
+     * @return
+     */
+    public static String setCityIdPas(HttpServletRequest reques){
+        if(StringUtils.isNotEmpty(reques.getHeader("city_id"))){
+            return reques.getHeader("city_id");
+        }else {
+            return "3";
+        }
+    }
+
+    /**
+     * String
+     * @param reques
+     * @return
+     */
+    public static Integer setCityIdPasInteger(HttpServletRequest reques){
+        if(StringUtils.isNotEmpty(reques.getHeader("city_id"))){
+            return Integer.parseInt(reques.getHeader("city_id"));
+        }else {
+            return 3;
+        }
+    }
+
+    /**
+     * String
+     * @param reques
+     * @return
+     */
+    public static Long setCityIdPasLong(HttpServletRequest reques){
+        if(StringUtils.isNotEmpty(reques.getHeader("city_id"))){
+            return Long.parseLong(reques.getHeader("city_id"));
+        }else {
+            return 3L;
+        }
+    }
+}