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

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/AppletSessionListController.java

@@ -89,8 +89,8 @@ public class AppletSessionListController extends BaseController {
                         sessionListVo.setMessage(messageVos.get(0).getContent());
                     } else {
                         List<MessageVo> messageVoList = messageMapper.selectVoList(Wrappers.<Message>lambdaQuery()
-                            .eq(Message::getSender, targetUserId)
-                            .eq(Message::getReceiver, getUserId())
+                            .eq(Message::getSender, getUserId())
+                            .eq(Message::getReceiver, targetUserId)
                             .eq(Message::getIsRead, 1)
                             .orderByDesc(Message::getCreateTime));
                         if (CollectionUtils.isNotEmpty(messageVoList)) {

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;
 }

pz-system/src/main/java/com/pz/system/mapper/CityMapper.java

@@ -4,6 +4,7 @@ import com.pz.system.domain.City;
 import com.pz.system.domain.vo.CityVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,5 +16,5 @@ import java.util.List;
  */
 @Mapper
 public interface CityMapper extends BaseMapperPlus<CityMapper, City, CityVo> {
-    List<CityVo> selectAppCity();
+    List<CityVo> selectAppCity(@Param("name") String name);
 }

pz-system/src/main/java/com/pz/system/service/impl/CityServiceImpl.java

@@ -60,9 +60,9 @@ public class CityServiceImpl implements ICityService {
 
     @Override
     public List<CityVo> queryAppList(CityBo bo) {
-        List<CityVo> cityVos = baseMapper.selectAppCity();
+        List<CityVo> cityVos = baseMapper.selectAppCity(bo.getName());
         for (CityVo cityVo : cityVos) {
-            cityVo.setCityVo(baseMapper.selectVoList(new LambdaQueryWrapper<City>().eq(City::getSy,cityVo.getSy())));
+            cityVo.setCityVo(baseMapper.selectVoList(new LambdaQueryWrapper<City>().eq(City::getSy,cityVo.getSy()).eq(City::getName,cityVo.getName())));
         }
         return cityVos;
     }

pz-system/src/main/java/com/pz/system/service/impl/DepartmentServiceImpl.java

@@ -150,6 +150,9 @@ public class DepartmentServiceImpl implements IDepartmentService {
         // 子菜单
         List<DepartmentVo> childList = new ArrayList<>();
         for (DepartmentVo entity : allMenu) {
+            entity.setLabel(entity.getTitle());
+            entity.setValue(entity.getId());
+            entity.setText(entity.getTitle());
             if (entity.getParentId().toString().equals(id)) {
                 childList.add(entity);
             }

pz-system/src/main/java/com/pz/system/service/impl/HospitalServiceImpl.java

@@ -75,6 +75,7 @@ public class HospitalServiceImpl implements IHospitalService {
     public TableDataInfo<HospitalVo> queryPageList(HospitalBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<Hospital> lqw = new LambdaQueryWrapper<>();
         Page<HospitalVo> result = new Page<>();
+        bo.setStatus(1);
         if (null == bo.getId()) {
             lqw = buildQueryWrapper(bo);
             result = baseMapper.selectVoPage(pageQuery.build(), lqw);

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -28,10 +28,12 @@ import com.pz.common.exception.ServiceException;
 import com.pz.common.utils.HttpUtils;
 import com.pz.merchant.domain.Company;
 import com.pz.merchant.domain.Employees;
+import com.pz.merchant.domain.EmployeesDivide;
 import com.pz.merchant.domain.vo.EmployeesVo;
 import com.pz.common.utils.JsonUtils;
 import com.pz.merchant.domain.vo.SonOrderVo;
 import com.pz.merchant.mapper.CompanyMapper;
+import com.pz.merchant.mapper.EmployeesDivideMapper;
 import com.pz.merchant.mapper.EmployeesMapper;
 import com.pz.merchant.service.ISonOrderService;
 import com.pz.merchant.service.impl.SonOrderServiceBuilder;
@@ -114,6 +116,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
 
     private final EmployeesMapper employeesMapper;
 
+    private final EmployeesDivideMapper employeesDivideMapper;
+
     private final PaymentRecordMapper paymentRecordMapper;
 
     private final OrderDelayQueue delayQueue;
@@ -602,6 +606,11 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
         //除了商城订单和诊前挂号不需要给陪诊员和商户分成
         if(totalOrder1.getBusinessId() != 0 && totalOrder1.getBusinessId() != 6){
             Services services = servicesMapper.selectById(totalOrder1.getServiceId());
+            //添加订单分成记录
+            EmployeesDivide employeesDivide = new EmployeesDivide();
+            employeesDivide.setOrderId(totalOrder1.getId().intValue());
+            employeesDivide.setOrderPrice(totalOrder1.getPayMoney()+"");
+
             if(services.getFenmo() != 0){
                 double money = 0;
                 Employees employees = employeesMapper.selectById(totalOrder1.getEmId());
@@ -611,8 +620,9 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
                  */
                 double fenmo = (double) services.getFenmo() / 100;
 
-                double v = totalOrder.getPayMoney() * fenmo;
-
+                double v = totalOrder1.getPayMoney() * fenmo;
+                employeesDivide.setProportion(services.getFenmo());
+                employeesDivide.setEmId(employees.getId());
                 money = v;
 
                 if(employees.getCompanyId() != 0){
@@ -620,16 +630,21 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
                     Company company = companyMapper.selectById(employees.getCompanyId());
                     company.setTotalRevenue((Double.parseDouble(company.getTotalRevenue()) + money) + "");
                     company.setBalance((Double.parseDouble(company.getBalance()) + money) +"");
+                    employeesDivide.setCompanyId(employees.getCompanyId());
 
                     companyMapper.updateById(company);
-
+                    employeesDivide.setDividePrice(money+"");
                 }else {
 
                     employees.setTotalRevenue((Double.parseDouble(employees.getTotalRevenue()) + money) + "");
                     employees.setBalance((Double.parseDouble(employees.getBalance()) + money) +"");
-                    employeesMapper.updateById(employees);
 
+                    employeesMapper.updateById(employees);
+                    employeesDivide.setDividePrice(money+"");
                 }
+
+                employeesDivideMapper.insert(employeesDivide);
+
             }
         }
 
@@ -843,7 +858,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             userRefund.setSonOrderId(sonOrderSimpleDataByTotalId.getSonOrderId());
             userRefund.setPhone(bo.getPhone());
             userRefund.setStatus(0);
-
+            userRefundMapper.insert(userRefund);
         }
 
 

pz-system/src/main/resources/mapper/system/CityMapper.xml

@@ -3,6 +3,11 @@
 <mapper namespace="com.pz.system.mapper.CityMapper">
 
     <select id="selectAppCity" resultType="com.pz.system.domain.vo.CityVo">
-        SELECT * FROM city GROUP BY sy
+        SELECT * FROM city sy
+        <if test="name != null and name != ''">
+            where sy.name LIKE CONCAT('%', #{name}, '%')
+        </if>
+        GROUP BY sy
+
     </select>
 </mapper>

pz-system/src/main/resources/mapper/system/ZqghOrderMapper.xml

@@ -39,7 +39,8 @@
         yyod.over_time AS overtime,
         yyod.voucher AS voucher,
         su.user_name AS userName,
-        yyod.create_Time as createTime
+        yyod.create_Time as createTime,
+        yyod.time_of_appointment as timeOfAppointment
         FROM zqgh_order AS yyod
         LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id
         LEFT JOIN city AS c ON c.id = tlo.city_id