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

pz-accompany/src/main/java/com/pz/accompany/AccompanyMessageController.java

+//package com.pz.accompany;
+//
+//import java.util.List;
+//import java.util.Arrays;
+//
+//import lombok.RequiredArgsConstructor;
+//import javax.servlet.http.HttpServletResponse;
+//import javax.validation.constraints.*;
+//import cn.dev33.satoken.annotation.SaCheckPermission;
+//import org.springframework.web.bind.annotation.*;
+//import org.springframework.validation.annotation.Validated;
+//import com.pz.common.annotation.RepeatSubmit;
+//import com.pz.common.annotation.Log;
+//import com.pz.common.core.controller.BaseController;
+//import com.pz.common.core.domain.PageQuery;
+//import com.pz.common.core.domain.R;
+//import com.pz.common.core.validate.AddGroup;
+//import com.pz.common.core.validate.EditGroup;
+//import com.pz.common.enums.BusinessType;
+//import com.pz.common.utils.poi.ExcelUtil;
+//import com.pz.system.domain.vo.MessageVo;
+//import com.pz.system.domain.bo.MessageBo;
+//import com.pz.system.service.IMessageService;
+//import com.pz.common.core.page.TableDataInfo;
+//
+///**
+// * 业务消息
+// *
+// * @author ruoyi
+// * @date 2023-09-15
+// */
+//@Validated
+//@RequiredArgsConstructor
+//@RestController
+//@RequestMapping("/system/message")
+//public class AccompanyMessageController extends BaseController {
+//
+//    private final IMessageService iMessageService;
+//
+//    /**
+//     * 查询业务消息列表
+//     */
+//    @SaCheckPermission("system:message:list")
+//    @GetMapping("/list")
+//    public TableDataInfo<MessageVo> list(MessageBo bo, PageQuery pageQuery) {
+//        return iMessageService.queryPageList(bo, pageQuery);
+//    }
+//
+//    /**
+//     * 导出业务消息列表
+//     */
+//    @SaCheckPermission("system:message:export")
+//    @Log(title = "业务消息", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(MessageBo bo, HttpServletResponse response) {
+//        List<MessageVo> list = iMessageService.queryList(bo);
+//        ExcelUtil.exportExcel(list, "业务消息", MessageVo.class, response);
+//    }
+//
+//    /**
+//     * 获取业务消息详细信息
+//     *
+//     * @param id 主键
+//     */
+//    @SaCheckPermission("system:message:query")
+//    @GetMapping("/{id}")
+//    public R<MessageVo> getInfo(@NotNull(message = "主键不能为空")
+//                                     @PathVariable Long id) {
+//        return R.ok(iMessageService.queryById(id));
+//    }
+//
+//    /**
+//     * 新增业务消息
+//     */
+//    @SaCheckPermission("system:message:add")
+//    @Log(title = "业务消息", businessType = BusinessType.INSERT)
+//    @RepeatSubmit()
+//    @PostMapping()
+//    public R<Void> add(@Validated(AddGroup.class) @RequestBody MessageBo bo) {
+//        return toAjax(iMessageService.insertByBo(bo));
+//    }
+//
+//    /**
+//     * 修改业务消息
+//     */
+//    @SaCheckPermission("system:message:edit")
+//    @Log(title = "业务消息", businessType = BusinessType.UPDATE)
+//    @RepeatSubmit()
+//    @PutMapping()
+//    public R<Void> edit(@Validated(EditGroup.class) @RequestBody MessageBo bo) {
+//        return toAjax(iMessageService.updateByBo(bo));
+//    }
+//
+//    /**
+//     * 删除业务消息
+//     *
+//     * @param ids 主键串
+//     */
+//    @SaCheckPermission("system:message:remove")
+//    @Log(title = "业务消息", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+//                          @PathVariable Long[] ids) {
+//        return toAjax(iMessageService.deleteWithValidByIds(Arrays.asList(ids), true));
+//    }
+//}

pz-admin/src/main/java/com/pz/web/controller/system/SessionListController.java → pz-applet/src/main/java/com/pz/applet/AppletSessionListController.java

-package com.pz.web.controller.system;
+package com.pz.applet;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.pz.common.annotation.Log;
@@ -8,7 +7,6 @@ import com.pz.common.annotation.RepeatSubmit;
 import com.pz.common.core.controller.BaseController;
 import com.pz.common.core.domain.PageQuery;
 import com.pz.common.core.domain.R;
-import com.pz.common.core.domain.entity.SysUser;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.validate.AddGroup;
 import com.pz.common.enums.BusinessType;
@@ -16,7 +14,6 @@ import com.pz.system.domain.SessionList;
 import com.pz.system.domain.bo.SessionListBo;
 import com.pz.system.domain.vo.SessionListVo;
 import com.pz.system.mapper.SessionListMapper;
-import com.pz.system.mapper.SysUserMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -33,8 +30,8 @@ import javax.validation.constraints.NotEmpty;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/session")
-public class SessionListController extends BaseController {
+@RequestMapping("/applet/session")
+public class AppletSessionListController extends BaseController {
 
     private final SessionListMapper sessionListMapper;
 
@@ -43,7 +40,7 @@ public class SessionListController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo<SessionListVo> list(SessionListBo bo, PageQuery pageQuery) {
-        return sessionListMapper.selectVoPage(pageQuery.build(), Wrappers.<SessionList>lambdaQuery().eq(SessionList::getUserId, getUserId()));
+        return sessionListMapper.selectVoPage(pageQuery.build(), Wrappers.<SessionList>lambdaQuery().eq(SessionList::getUserId, getUserId()).or().eq(SessionList::getToUserId, getUserId()));
     }
 
 

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

 package com.pz.applet;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
@@ -150,6 +151,7 @@ public class AppletTotalOrderController extends BaseController {
      */
     @RepeatSubmit()
     @PostMapping("/Orderpay")
+    @SaIgnore
     public R<Object> Orderpay(@Validated(AddGroup.class) @RequestBody TotalOrderBo recordBo) {
         return R.ok(iTotalOrderService.payOrder(recordBo));
     }

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

@@ -62,7 +62,7 @@ public class DbmyOrderBo extends BaseEntity {
     /**
      * 收获地址
      */
-    private String adress;
+    private String address;
 
     /**
      * 详细地址

pz-system/src/main/java/com/pz/system/domain/vo/AccompanyDemandVo.java

@@ -74,4 +74,9 @@ public class AccompanyDemandVo {
      */
     private Integer evaluationFlag;
 
+    /**
+     * 用户id
+     */
+    private Integer uid;
+
 }

pz-system/src/main/java/com/pz/system/domain/vo/DbmyOrderVo.java

@@ -94,7 +94,7 @@ public class DbmyOrderVo {
      * 收获地址
      */
     @ExcelProperty(value = "收获地址")
-    private String adress;
+    private String address;
 
     /**
      * 详细地址

pz-system/src/main/java/com/pz/system/domain/vo/YypzOrderItemVo.java

@@ -55,4 +55,8 @@ public class YypzOrderItemVo extends OrderCommonVo {
      */
     private String remark;
 
+    /**
+     * 用户id
+     */
+    private Integer uid;
 }

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

@@ -87,7 +87,7 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService, ISonOrderService
         lqw.eq(StringUtils.isNotBlank(bo.getPrescriptionAttachment()), DbmyOrder::getPrescriptionAttachment, bo.getPrescriptionAttachment());
         lqw.eq(bo.getWay() != null, DbmyOrder::getWay, bo.getWay());
         lqw.eq(StringUtils.isNotBlank(bo.getRecipient()), DbmyOrder::getRecipient, bo.getRecipient());
-        lqw.eq(StringUtils.isNotBlank(bo.getAdress()), DbmyOrder::getAddress, bo.getAdress());
+        lqw.eq(StringUtils.isNotBlank(bo.getAddress()), DbmyOrder::getAddress, bo.getAddress());
         lqw.eq(StringUtils.isNotBlank(bo.getAddressInfo()), DbmyOrder::getAddressInfo, bo.getAddressInfo());
         lqw.eq(StringUtils.isNotBlank(bo.getPhone()), DbmyOrder::getPhone, bo.getPhone());
         lqw.eq(bo.getIsRefrigerate() != null, DbmyOrder::getIsRefrigerate, bo.getIsRefrigerate());

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

@@ -494,7 +494,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
 
     @Override
     public Object payOrder(TotalOrderBo bo) {
-        LoginUser loginUser = LoginHelper.getLoginUser();
+//        LoginUser loginUser = LoginHelper.getLoginUser();
         TotalOrder totalOrder = baseMapper.selectById(Integer.parseInt(bo.getOrderSn()));
         Object payment = null;
         int money = (int) (totalOrder.getPayMoney() * 100);
@@ -503,7 +503,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             orderRequest.setBody(bo.getOrderTitle());
             orderRequest.setOutTradeNo(totalOrder.getOrderSn());
             orderRequest.setTotalFee(money);// 元转成分
-            orderRequest.setOpenid(sysUserMapper.selectById(loginUser.getUserId()).getOpenId());
+            orderRequest.setOpenid("o37SK64I29ISwKLPb3tfBEYgZHAM");
             orderRequest.setSpbillCreateIp("127.0.0.1");
             orderRequest.setNotifyUrl("http://127.0.0.1:8089/applet/totalOrder/orderPayCallBack");
 

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

@@ -12,7 +12,8 @@
                total_order.business_id,
                total_order.remark                      as description,
                total_order.evaluation_content,
-               total_order.is_satisfaction             as evaluation_flag
+               total_order.is_satisfaction             as evaluation_flag,
+               total_order.uid                         as uid
         from total_order
                  left join services on total_order.service_id = services.id
                  left join business on total_order.business_id = business.id

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

@@ -84,7 +84,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                user_vsitor.name                        as userName,
                hospital.name                           as hospital,
                department.title                        as department,
-               yypz_order.remark
+               yypz_order.remark,
+               total_order.uid                         as uid
         from total_order
                  left join business on business.id = total_order.business_id
                  left join yypz_order on yypz_order.order_id = total_order.id