用户端代码提交

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

@@ -23,6 +23,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -47,7 +48,8 @@ public class AppletArticleController extends BaseController {
      * 查询文章列表
      */
     @GetMapping("/list")
-    public TableDataInfo<ArticleVo> list(ArticleBo bo, PageQuery pageQuery) {
+    public TableDataInfo<ArticleVo> list(ArticleBo bo, PageQuery pageQuery, HttpServletRequest reques) {
+        bo.setCityId(Integer.parseInt(reques.getHeader("city_id")));
         return iArticleService.queryPageListByApp(bo, pageQuery);
     }
 

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

@@ -21,6 +21,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -74,7 +75,8 @@ public class AppletEmployeesController extends BaseController {
      */
     @RepeatSubmit()
     @PostMapping("/add")
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody EmployeesCompanyBo bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody EmployeesCompanyBo bo, HttpServletRequest reques) {
+        bo.setCityId(Integer.parseInt(reques.getHeader("city_id")));
         bo.setUid(LoginHelper.getLoginUser().getUserId().intValue());
         return toAjax(iEmployeesService.insertByEmployeesCompanyBo(bo));
     }

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

@@ -18,6 +18,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -42,7 +43,8 @@ public class AppletHospitalController extends BaseController {
      * 查询医院列表
      */
     @GetMapping("/list")
-    public TableDataInfo<HospitalVo> list(HospitalBo bo, PageQuery pageQuery) {
+    public TableDataInfo<HospitalVo> list(HospitalBo bo, PageQuery pageQuery, HttpServletRequest reques) {
+        bo.setCityId(Integer.parseInt(reques.getHeader("city_id")));
         return iHospitalService.queryPageList(bo, pageQuery);
     }
 

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

@@ -18,6 +18,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -42,7 +43,8 @@ public class AppletInformationController extends BaseController {
      * 查询新闻资讯列表
      */
     @GetMapping("/list")
-    public TableDataInfo<InformationVo> list(InformationBo bo, PageQuery pageQuery) {
+    public TableDataInfo<InformationVo> list(InformationBo bo, PageQuery pageQuery, HttpServletRequest reques) {
+        bo.setCityId(Long.parseLong(reques.getHeader("city_id")));
         return iInformationService.queryPageList(bo, pageQuery);
     }
 

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

@@ -19,6 +19,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -44,8 +45,9 @@ public class AppletStoreApplyController extends BaseController {
      */
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody StoreApplyBo bo)
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody StoreApplyBo bo, HttpServletRequest reques)
     {
+        bo.setCityId(Integer.parseInt(reques.getHeader("city_id")));
         bo.setUid(LoginHelper.getLoginUser().getUserId().intValue());
         return toAjax(iStoreApplyService.insertByBo(bo));
     }

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

@@ -20,6 +20,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -44,7 +45,8 @@ public class AppletStoreGoodsController extends BaseController {
      * 商城首页数据
      */
     @GetMapping("/shopList")
-    public TableDataInfo<StoreGoodsVo> shopList(StoreGoodsBo bo, PageQuery pageQuery) {
+    public TableDataInfo<StoreGoodsVo> shopList(StoreGoodsBo bo, PageQuery pageQuery, HttpServletRequest reques) {
+        bo.setCityId(Long.parseLong(reques.getHeader("city_id")));
         return iStoreGoodsService.shopAppShop(bo, pageQuery);
     }
     /**

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

@@ -93,7 +93,8 @@ public class AppletTotalOrderController extends BaseController {
      */
     @RepeatSubmit()
     @PostMapping()
-    public R<TotalOrderVo> add(@Validated(AddGroup.class) @RequestBody CreateOrderBo bo) {
+    public R<TotalOrderVo> add(@Validated(AddGroup.class) @RequestBody CreateOrderBo bo, HttpServletRequest reques) {
+        bo.setCityId(Integer.parseInt(reques.getHeader("city_id")));
         return R.ok(iTotalOrderService.createOrder(bo));
     }
 

pz-system/src/main/java/com/pz/system/domain/bo/CreateOrderBo.java

@@ -201,4 +201,9 @@ public class CreateOrderBo extends BaseEntity {
      * 订单状态
      */
     private Integer status;
+
+    /**
+     * 城市id
+     */
+    private Integer cityId;
 }

pz-system/src/main/java/com/pz/system/domain/bo/EmployeesCompanyBo.java

@@ -72,4 +72,6 @@ public class EmployeesCompanyBo  extends BaseEntity {
      * 保证金金额
      */
     private Double cashDeposit;
+
+    private Integer cityId;
 }