用户端代码提交

1a06bd22 · sdif · ab48f67c · 1a06bd22 · 1a06bd22 · 1a06bd22
Commit 1a06bd22 authored Sep 15, 2023 by sdif
17 changed files
--- a/pz-admin/src/main/java/com/pz/web/controller/system/StoreApplyController.java
+++ b/pz-admin/src/main/java/com/pz/web/controller/system/StoreApplyController.java
@@ -3,6 +3,7 @@ package com.pz.web.controller.system;
 import java.util.List;
 import java.util.Arrays;
+import com.pz.common.helper.LoginHelper;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;

--- a/pz-admin/src/main/resources/application.yml
+++ b/pz-admin/src/main/resources/application.yml
@@ -304,3 +304,8 @@ file:
  #注意：响应路径必须加上file后缀
  response-path: https://www.pz.com/file
+--- #快宝设置 https://open.kuaidihelp.com
+kb:
+  appId: 113444
+  appKey: d70e699e554e3193284f1cf97a1184454870c6b5
--- a/pz-applet/src/main/java/com/pz/applet/AppletStoreApplyController.java
+++ b/pz-applet/src/main/java/com/pz/applet/AppletStoreApplyController.java
@@ -10,6 +10,7 @@ import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.validate.AddGroup;
 import com.pz.common.core.validate.EditGroup;
 import com.pz.common.enums.BusinessType;
+import com.pz.common.helper.LoginHelper;
 import com.pz.common.utils.poi.ExcelUtil;
 import com.pz.system.domain.bo.StoreApplyBo;
 import com.pz.system.domain.vo.StoreApplyVo;
@@ -43,7 +44,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)
+    {
+        bo.setUid(LoginHelper.getLoginUser().getUserId().intValue());
        return toAjax(iStoreApplyService.insertByBo(bo));
    }

--- a/pz-applet/src/main/java/com/pz/applet/AppletTotalOrderController.java
+++ b/pz-applet/src/main/java/com/pz/applet/AppletTotalOrderController.java
@@ -77,6 +77,16 @@ public class AppletTotalOrderController extends BaseController {
        return R.ok(iTotalOrderService.queryByAppId(id));
    }
+    /**
+     * 查询物流信息
+     *
+     */
+    @GetMapping("/selectLogisticsStatus")
+    public R<Object> selectLogisticsStatus(TotalOrderBo totalOrderBo) {
+        return R.ok(iTotalOrderService.selectLogisticsStatus(totalOrderBo));
+    }
    /**
     * 新增总订单
     */

--- a/pz-applet/src/main/java/com/pz/applet/AppletZqghOrderController.java
+++ b/pz-applet/src/main/java/com/pz/applet/AppletZqghOrderController.java
@@ -47,4 +47,5 @@ public class AppletZqghOrderController extends BaseController {
        return R.ok(iZqghOrderService.queryAppList(bo));
    }
 }
--- a/pz-common/src/main/java/com/pz/common/config/KbProperties.java
+++ b/pz-common/src/main/java/com/pz/common/config/KbProperties.java
+package com.pz.common.config;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+/**
+ * 快宝物流参数
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "kb")
+public class KbProperties {
+    /**
+     * 快宝appid
+     */
+    private String appId;
+    /**
+     * 快宝appKey
+     */
+    private String appKey;
+}
--- a/pz-common/src/main/java/com/pz/common/utils/HttpUtils.java
+++ b/pz-common/src/main/java/com/pz/common/utils/HttpUtils.java
--- a/pz-system/src/main/java/com/pz/system/datastructure/OrderDelayQueue.java
+++ b/pz-system/src/main/java/com/pz/system/datastructure/OrderDelayQueue.java
@@ -4,6 +4,7 @@ import com.pz.system.domain.TotalOrder;
 import com.pz.system.domain.bo.TotalOrderBo;
 import com.pz.system.mapper.TotalOrderMapper;
 import com.pz.system.service.ITotalOrderService;
+import com.pz.system.service.IZqghOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -14,8 +15,8 @@ import java.util.concurrent.DelayQueue;
 public class OrderDelayQueue {
    private DelayQueue<TotalOrder> delayQueue = new DelayQueue<>();
-    /*@Autowired
+    @Autowired
-    private TotalOrderMapper iTotalOrderService;*/
+    private IZqghOrderService iZqghOrderService;
    // 添加订单到延时队列
    public void addOrder(TotalOrder order) {
@@ -44,6 +45,6 @@ public class OrderDelayQueue {
        totalOrderBo.setId(order.getId());
        // 执行取消订单的相关操作
-        //iTotalOrderService.cancelOrder(totalOrderBo);
+        iZqghOrderService.cancelOrder(totalOrderBo);
    }
 }
--- a/pz-system/src/main/java/com/pz/system/domain/bo/TotalOrderBo.java
+++ b/pz-system/src/main/java/com/pz/system/domain/bo/TotalOrderBo.java
@@ -90,4 +90,11 @@ public class TotalOrderBo extends BaseEntity {
    private String orderTitle;
    private String openid;
+    /**
+     * 流水单号
+     */
+    private String logisticsCode;
+    private String phone;
 }
--- a/pz-system/src/main/java/com/pz/system/domain/vo/StoreApplyVo.java
+++ b/pz-system/src/main/java/com/pz/system/domain/vo/StoreApplyVo.java
@@ -119,6 +119,7 @@ public class StoreApplyVo extends BaseEntity {
    @ExcelProperty(value = "")
    private Integer status;
+    private String remark;
    /**
     * 商品
     */

--- a/pz-system/src/main/java/com/pz/system/domain/vo/StoreGoodsVo.java
+++ b/pz-system/src/main/java/com/pz/system/domain/vo/StoreGoodsVo.java
@@ -108,6 +108,10 @@ public class StoreGoodsVo extends BaseEntity {
    @ExcelProperty(value = "")
    private Integer saleNum;
+    private Integer num;
+    private Integer addressId;
    private List<Carousel> carousel;
    private List<Integer> ids;
@@ -115,4 +119,9 @@ public class StoreGoodsVo extends BaseEntity {
    private List<StoreGoodsTagVo> list;
    private String typeName;
+    /**
+     * 流水单号
+     */
+    private String logisticsCode;
 }
--- a/pz-system/src/main/java/com/pz/system/domain/vo/TotalOrderVo.java
+++ b/pz-system/src/main/java/com/pz/system/domain/vo/TotalOrderVo.java
@@ -170,7 +170,7 @@ public class TotalOrderVo {
    /**
     * 就诊时间
     */
-    private String visitTime;
+    private Date visitTime;
    /**
     * 手机号
@@ -261,7 +261,7 @@ public class TotalOrderVo {
    /**
     * 取药方式：0-邮寄到家，1-送货上门
     */
-    private String way;
+    private Integer way;
    /**
     * 收件人
@@ -271,7 +271,7 @@ public class TotalOrderVo {
    /**
     * 收货地址
     */
-    private String adress;
+    private String address;
    /**
     * 详细地址
@@ -287,4 +287,24 @@ public class TotalOrderVo {
     * 预约时间
     */
    private String timeOfAppointment;
+    /**
+     * 上次就医情况
+     */
+    private String lastMedicalTreatmentSituation;
+    /**
+     * 商品实体
+     */
+    private StoreGoodsVo storeGoodsVo;
+    /**
+     * 发货实体
+     */
+    private UserAddressVo userAddressVo;
+    /**
+     * 发货状态
+     */
+    private Object object;
 }
--- a/pz-system/src/main/java/com/pz/system/service/ITotalOrderService.java
+++ b/pz-system/src/main/java/com/pz/system/service/ITotalOrderService.java
@@ -139,4 +139,11 @@ public interface ITotalOrderService {
     */
    AccompanyDemandVo queryTotalOrderById(Long id);
+    /**
+     * 查询物流状态
+     * @return
+     */
+    Object selectLogisticsStatus(TotalOrderBo totalOrderBo);
 }
--- a/pz-system/src/main/java/com/pz/system/service/IZqghOrderService.java
+++ b/pz-system/src/main/java/com/pz/system/service/IZqghOrderService.java
 package com.pz.system.service;
+import com.pz.common.enums.TotalOrderStatus;
+import com.pz.common.exception.ServiceException;
+import com.pz.system.domain.TotalOrder;
 import com.pz.system.domain.ZqghOrder;
+import com.pz.system.domain.bo.TotalOrderBo;
 import com.pz.system.domain.vo.ZqghOrderVo;
 import com.pz.system.domain.bo.ZqghOrderBo;
 import com.pz.common.core.page.TableDataInfo;
@@ -51,6 +55,13 @@ public interface IZqghOrderService {
    Boolean updateByBo(ZqghOrderBo bo);
    /**
+     * 取消订单
+     * @param bo
+     * @return
+     */
+    Boolean cancelOrder(TotalOrderBo bo);
+    /**
     * 校验并批量删除诊前挂号订单信息
     */
    Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);

--- a/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
+++ b/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
--- a/pz-system/src/main/java/com/pz/system/service/impl/ZqghOrderServiceImpl.java
+++ b/pz-system/src/main/java/com/pz/system/service/impl/ZqghOrderServiceImpl.java
@@ -7,9 +7,14 @@ import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.common.enums.TotalOrderStatus;
+import com.pz.common.exception.ServiceException;
 import com.pz.merchant.domain.vo.SonOrderVo;
 import com.pz.merchant.service.ISonOrderService;
 import com.pz.system.domain.DbwzOrder;
+import com.pz.system.domain.TotalOrder;
+import com.pz.system.domain.bo.TotalOrderBo;
+import com.pz.system.mapper.TotalOrderMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.pz.system.domain.bo.ZqghOrderBo;
@@ -33,6 +38,8 @@ public class ZqghOrderServiceImpl implements IZqghOrderService, ISonOrderService
    private final ZqghOrderMapper baseMapper;
+    private final TotalOrderMapper totalOrderMapper;
    /**
     * 查询诊前挂号订单
     */
@@ -132,6 +139,18 @@ public class ZqghOrderServiceImpl implements IZqghOrderService, ISonOrderService
        return baseMapper.updateById(update) > 0;
    }
+    @Override
+    public Boolean cancelOrder(TotalOrderBo bo) {
+        TotalOrder totalOrder = totalOrderMapper.selectById(bo.getId());
+        if(totalOrder.getEmId() == 0){//预约陪诊
+            //yypzOrderMapper.selectOne(new LambdaQueryWrapper<YypzOrder>().eq(YypzOrder::getOrderId,totalOrder));
+            totalOrder.setStatus(TotalOrderStatus.CANCEL.getCode());
+            return totalOrderMapper.updateById(totalOrder) > 0;
+        }else {
+            throw new ServiceException("该订单已分配给陪诊员，不允许取消订单！");
+        }
+    }
    /**
     * 保存前的数据校验
     */

--- a/pz-system/src/main/resources/mapper/merchant/EmployeesMapper.xml
+++ b/pz-system/src/main/resources/mapper/merchant/EmployeesMapper.xml
@@ -64,7 +64,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </select>
    <select id="selectEmployees" resultType="com.pz.merchant.domain.vo.EmployeesVo">
-        SELECT  e.id, s.avatar as avatar,e.name,e.working_hours,(SUM(CASE WHEN o.is_satisfaction = 1 THEN 1 ELSE 0 END) / NULLIF(COUNT(o.is_satisfaction), 0)) * 100 AS satisfaction_rate
+        SELECT  e.id,
+               s.avatar as avatar,
+               e.name,
+               e.start_year,
+               e.working_hours,
+               (SUM(CASE WHEN o.is_satisfaction = 1 THEN 1 ELSE 0 END) / NULLIF(COUNT(o.is_satisfaction), 0)) * 100 AS satisfaction_rate
        FROM employees e
        left join total_order o on o.em_id = e.id
        left join company c on c.id = e.company_id