用户端代码提交

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

+package com.pz.applet;
+
+import com.pz.common.core.controller.BaseController;
+import com.pz.common.core.domain.R;
+import com.pz.common.enums.HospitalLevel;
+import com.pz.common.enums.HospitalType;
+import com.pz.system.domain.bo.CityBo;
+import com.pz.system.domain.vo.CityVo;
+import com.pz.system.domain.vo.CommonKeyValuesVo;
+import com.pz.system.service.ICityService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 公共接口
+ *
+ * @author ruoyi
+ * @date 2023-09-07
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/applet/common")
+public class AppletCommonController extends BaseController {
+
+    private final ICityService iCityService;
+
+    /**
+     * 医院等级列表
+     */
+    @GetMapping("/hospitalLevelList")
+    public R<List<CommonKeyValuesVo>> hospitalLevelList() {
+        List<CommonKeyValuesVo> enumList = Arrays.stream(HospitalLevel.values())
+            .map(e -> {
+                CommonKeyValuesVo commonKeyValuesVo = new CommonKeyValuesVo();
+                commonKeyValuesVo.setCode(e.getCode());
+                commonKeyValuesVo.setName(e.getName());
+                return commonKeyValuesVo;
+            })
+            .collect(Collectors.toList());
+        return R.ok(enumList);
+    }
+
+    /**
+     * 医院类别列表
+     */
+    @GetMapping("/hospitalTypeList")
+    public R<List<CommonKeyValuesVo>> hospitalTypeList() {
+        List<CommonKeyValuesVo> enumList = Arrays.stream(HospitalType.values())
+            .map(e -> {
+                CommonKeyValuesVo commonKeyValuesVo = new CommonKeyValuesVo();
+                commonKeyValuesVo.setCode(e.getCode());
+                commonKeyValuesVo.setName(e.getName());
+                return commonKeyValuesVo;
+            })
+            .collect(Collectors.toList());
+        return R.ok(enumList);
+    }
+
+    /**
+     * 城市列表
+     */
+    @GetMapping("/cityVoList")
+    public R<List<CityVo>> cityVoList(CityBo bo) {
+        return R.ok(iCityService.queryList(bo));
+    }
+}

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

@@ -12,8 +12,11 @@ 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.bo.CreateOrderBo;
+import com.pz.system.domain.bo.PaymentRecordBo;
 import com.pz.system.domain.bo.TotalOrderBo;
+import com.pz.system.domain.vo.PaymentRecordVo;
 import com.pz.system.domain.vo.TotalOrderVo;
+import com.pz.system.service.IPaymentRecordService;
 import com.pz.system.service.ITotalOrderService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -40,6 +43,8 @@ public class AppletTotalOrderController extends BaseController {
 
     private final ITotalOrderService iTotalOrderService;
 
+    private final IPaymentRecordService iPaymentRecordService;
+
     /**
      * 查询总订单列表
      */
@@ -55,8 +60,8 @@ public class AppletTotalOrderController extends BaseController {
      */
     @GetMapping("/{id}")
     public R<TotalOrderVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iTotalOrderService.queryById(id));
+                                     @PathVariable Integer id) {
+        return R.ok(iTotalOrderService.queryByAppId(id));
     }
 
     /**
@@ -87,4 +92,31 @@ public class AppletTotalOrderController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(iTotalOrderService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
+
+    /**
+     * 用户主动退款
+     */
+    @RepeatSubmit()
+    @PostMapping("/refundOrder")
+    public R<Void> refundOrder(@Validated(AddGroup.class) @RequestBody TotalOrderBo recordBo) {
+        return toAjax(iTotalOrderService.refundOrder(recordBo));
+    }
+
+    /**
+     * 用户评价订单
+     */
+    @RepeatSubmit()
+    @PostMapping("/appraise")
+    public R<Void> appraise(@Validated(AddGroup.class) @RequestBody TotalOrderBo recordBo) {
+        return toAjax(iTotalOrderService.updateByBo(recordBo));
+    }
+
+    /**
+     * 用户取消订单
+     */
+    @RepeatSubmit()
+    @PostMapping("/cancelOrder")
+    public R<Void> cancelOrder(@Validated(AddGroup.class) @RequestBody TotalOrderBo recordBo) {
+        return toAjax(iTotalOrderService.cancelOrder(recordBo));
+    }
 }

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

@@ -4,6 +4,7 @@ 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 com.pz.system.domain.StoreGoodsTag;
 import lombok.Data;
 
 import java.util.List;
@@ -67,7 +68,7 @@ public class TotalOrderVo {
      * 订单价格
      */
     @ExcelProperty(value = "订单价格")
-    private String payMoney;
+    private Double payMoney;
 
     /**
      * 订单状态
@@ -133,11 +134,46 @@ public class TotalOrderVo {
     /**
      * 标签
      */
-    private String tags;
+    private List<StoreGoodsTag> tags;
 
     /**
      * 陪护时间
      */
     private List<String> chaperonageDate;
 
+    /**
+     * 业务名称
+     */
+    private String business;
+
+    /**
+     * 服务名称
+     */
+    private String service;
+
+    /**
+     * 医院名称
+     */
+    private String hospital;
+
+    /**
+     * 就诊人
+     */
+    private String visitor;
+
+    /**
+     * 科室
+     */
+    private String department;
+
+    /**
+     * 就诊时间
+     */
+    private String visitTime;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
 }

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

@@ -7,6 +7,7 @@ import com.pz.merchant.domain.Company;
 import com.pz.merchant.domain.vo.FinanceOrderInfoVo;
 import com.pz.system.domain.TotalOrder;
 import com.pz.system.domain.vo.AccompanyDemandVo;
+import com.pz.system.domain.vo.AppOrderVo;
 import com.pz.system.domain.vo.TotalOrderVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Mapper;
@@ -40,4 +41,15 @@ public interface TotalOrderMapper extends BaseMapperPlus<TotalOrderMapper, Total
      */
     AccompanyDemandVo selectTotalOrderById(Long id);
 
+
+    /**
+     * 查询用户端订单
+     *
+     * @param page         分页参数
+     * @param queryWrapper 查询条件
+     * @return 结果
+     */
+    IPage<TotalOrderVo> selectAppOrder(IPage<TotalOrderVo> page, @Param(Constants.WRAPPER) Wrapper<TotalOrder> queryWrapper);
+
+    TotalOrderVo selectByOrderId(@Param("id") Integer id);
 }

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

@@ -26,6 +26,13 @@ public interface ITotalOrderService {
     TotalOrderVo queryById(Long id);
 
     /**
+     * 查询用户订单详情
+     * @param id
+     * @return
+     */
+    TotalOrderVo queryByAppId(Integer id);
+
+    /**
      * 查询总订单列表
      */
     TableDataInfo<TotalOrderVo> queryPageList(TotalOrderBo bo, PageQuery pageQuery);
@@ -54,6 +61,20 @@ public interface ITotalOrderService {
     Boolean updateByBo(TotalOrderBo bo);
 
     /**
+     * 用户取消订单
+     * @param bo
+     * @return
+     */
+    Boolean cancelOrder(TotalOrderBo bo);
+
+    /**
+     * 用户主动退款
+     * @param bo
+     * @return
+     */
+    Boolean refundOrder(TotalOrderBo bo);
+
+    /**
      * 校验并批量删除总订单信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);

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

@@ -28,4 +28,41 @@
         <include refid="OrderCommon"/>
         where total_order.id = #{id}
     </select>
+    <select id="selectAppOrder" resultType="com.pz.system.domain.vo.TotalOrderVo">
+
+    </select>
+
+    <select id="selectByOrderId" resultType="com.pz.system.domain.vo.TotalOrderVo">
+        select
+        t.id,
+        t.order_sn,
+        t.uid,
+        t.em_id,
+        t.city_id,
+        t.business_id,
+        t.service_id,
+        t.pay_money,
+        t.status,
+        t.lng,
+        t.lat,
+        t.is_satisfaction,
+        t.evaluation_content,
+        t.refund_reason,
+        t.refund_amount,
+        t.pay_cs,
+        t.del_flag,
+        t.create_by,
+        t.create_time,
+        t.update_by,
+        t.update_time,
+        t.remark,
+        b.name as business,
+        s.name as service
+        from total_order t
+                          left join business b on b.id = t.business_id
+                          left join services s on s.id = t.service_id
+                          left join employees e on e.id = t.em_id
+        where t.id = #{id}
+    </select>
+
 </mapper>