修改代码

pz-admin/pom.xml

@@ -77,6 +77,18 @@
             <artifactId>pz-merchant</artifactId>
             <artifactId>pz-merchant</artifactId>
         </dependency>
         </dependency>
 
 
+        <!-- 陪诊员模块 -->
+        <dependency>
+            <groupId>com.pz</groupId>
+            <artifactId>pz-accompany</artifactId>
+        </dependency>
+
+        <!-- 小程序用户模块 -->
+        <dependency>
+            <groupId>com.pz</groupId>
+            <artifactId>pz-applet</artifactId>
+        </dependency>
+
         <dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <artifactId>spring-boot-starter-test</artifactId>

pz-admin/src/main/java/com/pz/web/controller/system/StoreOrderController.java

+package com.pz.web.controller.system;
+
+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.StoreOrderVo;
+import com.pz.system.domain.bo.StoreOrderBo;
+import com.pz.system.service.IStoreOrderService;
+import com.pz.common.core.page.TableDataInfo;
+
+/**
+ * 商城订单
+ *
+ * @author ruoyi
+ * @date 2023-09-07
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/order")
+public class StoreOrderController extends BaseController {
+
+    private final IStoreOrderService iStoreOrderService;
+
+    /**
+     * 查询商城订单列表
+     */
+    @SaCheckPermission("system:order:list")
+    @GetMapping("/list")
+    public TableDataInfo<StoreOrderVo> list(StoreOrderBo bo, PageQuery pageQuery) {
+        return iStoreOrderService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出商城订单列表
+     */
+    @SaCheckPermission("system:order:export")
+    @Log(title = "商城订单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(StoreOrderBo bo, HttpServletResponse response) {
+        List<StoreOrderVo> list = iStoreOrderService.queryList(bo);
+        ExcelUtil.exportExcel(list, "商城订单", StoreOrderVo.class, response);
+    }
+
+    /**
+     * 获取商城订单详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:order:query")
+    @GetMapping("/{id}")
+    public R<StoreOrderVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Integer id) {
+        return R.ok(iStoreOrderService.queryById(id));
+    }
+
+    /**
+     * 新增商城订单
+     */
+    @SaCheckPermission("system:order:add")
+    @Log(title = "商城订单", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody StoreOrderBo bo) {
+        return toAjax(iStoreOrderService.insertByBo(bo));
+    }
+
+    /**
+     * 修改商城订单
+     */
+    @SaCheckPermission("system:order:edit")
+    @Log(title = "商城订单", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody StoreOrderBo bo) {
+        return toAjax(iStoreOrderService.updateByBo(bo));
+    }
+
+    /**
+     * 删除商城订单
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:order:remove")
+    @Log(title = "商城订单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Integer[] ids) {
+        return toAjax(iStoreOrderService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

pz-admin/src/main/resources/application.yml

@@ -140,6 +140,7 @@ security:
     - /actuator/**
     - /actuator/**
     # system 仅用于调试阶段
     # system 仅用于调试阶段
     - /system/**
     - /system/**
+    - /applet/**
 
 
 # MyBatisPlus配置
 # MyBatisPlus配置
 # https://baomidou.com/config/
 # https://baomidou.com/config/

pz-system/src/main/java/com/pz/system/domain/StoreOrder.java

+package com.pz.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.pz.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 商城订单对象 store_order
+ *
+ * @author ruoyi
+ * @date 2023-09-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("store_order")
+public class StoreOrder extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Integer id;
+    /**
+     *
+     */
+    private Integer storeId;
+    /**
+     * 主订单
+     */
+    private Integer orderId;
+    /**
+     * 商品
+     */
+    private Integer goodsId;
+    /**
+     * 数量
+     */
+    private Integer num;
+    /**
+     * 收获地址id
+     */
+    private Integer addressId;
+    /**
+     * 当前状态
+     */
+    private Integer status;
+    /**
+     * 服务结束时间
+     */
+    private Date overTime;
+    /**
+     * 完成凭证
+     */
+    private String voucher;
+    /**
+     *
+     */
+    private String logistics;
+    /**
+     *
+     */
+    private String logisticsCode;
+    /**
+     *
+     */
+    private String refundLogistics;
+    /**
+     *
+     */
+    private String refundLogisticsCode;
+    /**
+     * 删除标志(0代表存在 2代表删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+}

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

+package com.pz.system.domain.bo;
+
+import com.pz.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 商城订单业务对象 store_order
+ *
+ * @author ruoyi
+ * @date 2023-09-07
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StoreOrderBo extends BaseEntity {
+
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     *
+     */
+    private Integer storeId;
+
+    /**
+     * 主订单
+     */
+    private Integer orderId;
+
+    /**
+     * 商品
+     */
+    private Integer goodsId;
+
+    /**
+     * 数量
+     */
+    private Integer num;
+
+    /**
+     * 收获地址id
+     */
+    private Integer addressId;
+
+    /**
+     * 当前状态
+     */
+    private Integer status;
+
+    /**
+     * 服务结束时间
+     */
+    private Date overTime;
+
+    /**
+     * 完成凭证
+     */
+    private String voucher;
+
+    /**
+     *
+     */
+    private String logistics;
+
+    /**
+     *
+     */
+    private String logisticsCode;
+
+    /**
+     *
+     */
+    private String refundLogistics;
+
+    /**
+     *
+     */
+    private String refundLogisticsCode;
+
+
+}

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

+package com.pz.system.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.pz.common.annotation.ExcelDictFormat;
+import com.pz.common.convert.ExcelDictConvert;
+import lombok.Data;
+
+
+/**
+ * 商城订单视图对象 store_order
+ *
+ * @author ruoyi
+ * @date 2023-09-07
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class StoreOrderVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Integer id;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Integer storeId;
+
+    /**
+     * 主订单
+     */
+    @ExcelProperty(value = "主订单")
+    private Integer orderId;
+
+    /**
+     * 商品
+     */
+    @ExcelProperty(value = "商品")
+    private Integer goodsId;
+
+    /**
+     * 数量
+     */
+    @ExcelProperty(value = "数量")
+    private Integer num;
+
+    /**
+     * 收获地址id 
+     */
+    @ExcelProperty(value = "收获地址id ")
+    private Integer addressId;
+
+    /**
+     * 当前状态
+     */
+    @ExcelProperty(value = "当前状态")
+    private Integer status;
+
+    /**
+     * 服务结束时间
+     */
+    @ExcelProperty(value = "服务结束时间")
+    private Date overTime;
+
+    /**
+     * 完成凭证
+     */
+    @ExcelProperty(value = "完成凭证")
+    private String voucher;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String logistics;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String logisticsCode;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String refundLogistics;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private String refundLogisticsCode;
+
+
+}

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

+package com.pz.system.mapper;
+
+import com.pz.system.domain.StoreOrder;
+import com.pz.system.domain.vo.StoreOrderVo;
+import com.pz.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 商城订单Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-07
+ */
+public interface StoreOrderMapper extends BaseMapperPlus<StoreOrderMapper, StoreOrder, StoreOrderVo> {
+
+}

pz-system/src/main/java/com/pz/system/service/IStoreOrderService.java

+package com.pz.system.service;
+
+import com.pz.system.domain.StoreOrder;
+import com.pz.system.domain.vo.StoreOrderVo;
+import com.pz.system.domain.bo.StoreOrderBo;
+import com.pz.common.core.page.TableDataInfo;
+import com.pz.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商城订单Service接口
+ *
+ * @author ruoyi
+ * @date 2023-09-07
+ */
+public interface IStoreOrderService {
+
+    /**
+     * 查询商城订单
+     */
+    StoreOrderVo queryById(Integer id);
+
+    /**
+     * 查询商城订单列表
+     */
+    TableDataInfo<StoreOrderVo> queryPageList(StoreOrderBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询商城订单列表
+     */
+    List<StoreOrderVo> queryList(StoreOrderBo bo);
+
+    /**
+     * 新增商城订单
+     */
+    Boolean insertByBo(StoreOrderBo bo);
+
+    /**
+     * 修改商城订单
+     */
+    Boolean updateByBo(StoreOrderBo bo);
+
+    /**
+     * 校验并批量删除商城订单信息
+     */
+    Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
+}

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

+package com.pz.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.pz.common.core.page.TableDataInfo;
+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 lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.pz.system.domain.bo.StoreOrderBo;
+import com.pz.system.domain.vo.StoreOrderVo;
+import com.pz.system.domain.StoreOrder;
+import com.pz.system.mapper.StoreOrderMapper;
+import com.pz.system.service.IStoreOrderService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 商城订单Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-09-07
+ */
+@RequiredArgsConstructor
+@Service
+public class StoreOrderServiceImpl implements IStoreOrderService {
+
+    private final StoreOrderMapper baseMapper;
+
+    /**
+     * 查询商城订单
+     */
+    @Override
+    public StoreOrderVo queryById(Integer id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询商城订单列表
+     */
+    @Override
+    public TableDataInfo<StoreOrderVo> queryPageList(StoreOrderBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<StoreOrder> lqw = buildQueryWrapper(bo);
+        Page<StoreOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询商城订单列表
+     */
+    @Override
+    public List<StoreOrderVo> queryList(StoreOrderBo bo) {
+        LambdaQueryWrapper<StoreOrder> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<StoreOrder> buildQueryWrapper(StoreOrderBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<StoreOrder> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getStoreId() != null, StoreOrder::getStoreId, bo.getStoreId());
+        lqw.eq(bo.getOrderId() != null, StoreOrder::getOrderId, bo.getOrderId());
+        lqw.eq(bo.getGoodsId() != null, StoreOrder::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getNum() != null, StoreOrder::getNum, bo.getNum());
+        lqw.eq(bo.getAddressId() != null, StoreOrder::getAddressId, bo.getAddressId());
+        lqw.eq(bo.getStatus() != null, StoreOrder::getStatus, bo.getStatus());
+        lqw.eq(bo.getOverTime() != null, StoreOrder::getOverTime, bo.getOverTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getVoucher()), StoreOrder::getVoucher, bo.getVoucher());
+        lqw.eq(StringUtils.isNotBlank(bo.getLogistics()), StoreOrder::getLogistics, bo.getLogistics());
+        lqw.eq(StringUtils.isNotBlank(bo.getLogisticsCode()), StoreOrder::getLogisticsCode, bo.getLogisticsCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getRefundLogistics()), StoreOrder::getRefundLogistics, bo.getRefundLogistics());
+        lqw.eq(StringUtils.isNotBlank(bo.getRefundLogisticsCode()), StoreOrder::getRefundLogisticsCode, bo.getRefundLogisticsCode());
+        return lqw;
+    }
+
+    /**
+     * 新增商城订单
+     */
+    @Override
+    public Boolean insertByBo(StoreOrderBo bo) {
+        StoreOrder add = BeanUtil.toBean(bo, StoreOrder.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改商城订单
+     */
+    @Override
+    public Boolean updateByBo(StoreOrderBo bo) {
+        StoreOrder update = BeanUtil.toBean(bo, StoreOrder.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(StoreOrder entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除商城订单
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}