修改代码

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

+package com.pz.accompany;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.common.annotation.Log;
+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.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.utils.poi.ExcelUtil;
+import com.pz.merchant.domain.Employees;
+import com.pz.merchant.domain.vo.EmployeesVo;
+import com.pz.merchant.mapper.EmployeesMapper;
+import com.pz.merchant.service.IEmployeesService;
+import com.pz.system.domain.bo.ArticleBo;
+import com.pz.system.domain.bo.DoctorBo;
+import com.pz.system.domain.bo.IncomeBo;
+import com.pz.system.domain.vo.ArticleVo;
+import com.pz.system.domain.vo.DoctorVo;
+import com.pz.system.domain.vo.IncomeVo;
+import com.pz.system.service.IArticleService;
+import com.pz.system.service.IIncomeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 陪诊员-财务收益
+ *
+ * @author ruoyi
+ * @date 2023-09-07
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/accompany/employees")
+public class EmployeesIncomeController extends BaseController {
+
+    private final IEmployeesService iEmployeesService;
+
+    private final IIncomeService iIncomeService;
+
+    /**
+     * 获取总收益与余额
+     */
+    @GetMapping("/getIncome")
+    public R<EmployeesVo> getIncome() {
+        return R.ok(iEmployeesService.queryByUserId(getUserId()));
+    }
+
+
+    /**
+     * 查询陪诊员提现记录
+     */
+    @GetMapping("/list")
+    public TableDataInfo<IncomeVo> list(IncomeBo bo, PageQuery pageQuery) {
+        EmployeesVo employeesVo = iEmployeesService.queryByUserId(getUserId());
+        bo.setEcId(employeesVo.getId());
+        return iIncomeService.queryByEidList(bo, pageQuery);
+    }
+}

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

@@ -2,8 +2,12 @@ package com.pz.web.controller.system;
 
 import java.util.List;
 import java.util.Arrays;
+import java.util.Optional;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.system.domain.StoreInfo;
 import com.pz.system.domain.vo.StoreAdminOrderVo;
+import com.pz.system.mapper.StoreInfoMapper;
 import lombok.RequiredArgsConstructor;
 
 import javax.servlet.http.HttpServletResponse;
@@ -40,12 +44,16 @@ public class StoreOrderController extends BaseController {
 
     private final IStoreOrderService iStoreOrderService;
 
+    private final StoreInfoMapper storeInfoMapper;
+
     /**
      * 查询商城订单列表
      */
     @SaCheckPermission("system:storeOrder:list")
     @GetMapping("/list")
     public TableDataInfo<StoreAdminOrderVo> list(StoreOrderBo bo, PageQuery pageQuery) {
+        Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
+            .ifPresent(storeInfo -> bo.setStoreId(storeInfo.getId()));
         return iStoreOrderService.queryPageList(bo, pageQuery);
     }
 

pz-system/src/main/java/com/pz/merchant/service/IEmployeesService.java

@@ -117,4 +117,11 @@ public interface IEmployeesService {
      * @return 操作结果
      */
     boolean disableOrRecover(Integer emId);
+
+    /**
+     * 根据用户id获取陪诊员信息
+     * @param userId
+     * @return
+     */
+    EmployeesVo queryByUserId(Long userId);
 }

pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java

@@ -156,7 +156,7 @@ public class EmployeesServiceImpl implements IEmployeesService {
                 sysUserMapper.updateById(sysUser);
             }
             return flag;
-        } else if (bo.getIdentity() == 3) {// 商户新增
+        } else if (bo.getIdentity() == 3) {//商户新增
             Company add = BeanUtil.toBean(bo, Company.class);
 
             boolean flag = companyMapper.insert(add) > 0;
@@ -319,9 +319,8 @@ public class EmployeesServiceImpl implements IEmployeesService {
     public TodayOrderListVo queryEmployeesInfo(Integer emId) {
         TodayOrderListVo result = baseMapper.selectEmployeesInfoById(emId);
         QueryWrapper<Employees> query = Wrappers.query();
-        query.apply(" to_days(current_date) = to_days(total_order.create_time)")// 查询当天数据
-            .eq("total_order.em_id", emId)
-            .ne("total_order.business_id", 0);  // 排除商城订单
+        query.apply("date_format(total_order.create_time,'%Y-%m-%d') = current_date")
+            .eq("total_order.em_id", emId);
         IPage<OrderInfoVO> page = baseMapper.selectOrder(new PageQuery().build(), query);
         // 根据不同子订单装载就诊人员信息和子订单状态
         List<OrderInfoVO> orders = page.getRecords();
@@ -348,8 +347,7 @@ public class EmployeesServiceImpl implements IEmployeesService {
     public TableDataInfo<OrderInfoVO> queryAllOrder(OrderBo bo, PageQuery pageQuery) {
         QueryWrapper<Employees> query = Wrappers.query();
         query.eq(bo.getEmId() != null, "total_order.em_id", bo.getEmId())
-            .eq(bo.getServiceStatus() != null, "total_order.status", bo.getServiceStatus())
-            .ne("total_order.business_id", 0);  // 排除商城订单;
+            .eq(bo.getServiceStatus() != null, "total_order.status", bo.getServiceStatus());
         IPage<OrderInfoVO> page = baseMapper.selectOrder(pageQuery.build(), query);
         // 根据不同子订单装载就诊人员信息和子订单状态
         page.getRecords().forEach(suborder -> {

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

@@ -35,7 +35,7 @@ public class StoreGoodsCategory extends BaseEntity {
     /**
      * 排序
      */
-    private Integer order;
+    private Integer sortord;
     /**
      * 删除标志（0代表存在 2代表删除）
      */

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

@@ -35,7 +35,7 @@ public class StoreGoodsCategoryBo extends BaseEntity {
     /**
      * 排序
      */
-    private Integer order;
+    private Integer sortord;
 
     /**
      * 备注

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

 package com.pz.system.domain.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -59,5 +60,29 @@ public class StoreAdminOrderVo implements Serializable {
      */
     private Date createTime;
 
+
+    /**
+     * 物流名称
+     */
+    private String logistics;
+
+    /**
+     * 物流单号
+     */
+    private String logisticsCode;
+
+    /**
+     * 退货物流
+     */
+    private String refundLogistics;
+
+    /**
+     * 退货物流单号
+     */
+    private String refundLogisticsCode;
+
+    /**
+     * 用户收货信息
+     */
     private UserAddressVo userAddressVo;
 }

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

@@ -41,7 +41,7 @@ public class StoreGoodsCategoryVo {
      * 排序
      */
     @ExcelProperty(value = "排序")
-    private Integer order;
+    private Integer sortord;
 
     /**
      * 备注

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

@@ -46,4 +46,10 @@ public interface IIncomeService {
      * 校验并批量删除陪诊员/商户提现信息
      */
     Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
+
+    /**
+     * 根据陪诊员id获取提现记录
+     * @return
+     */
+    TableDataInfo<IncomeVo> queryByEidList(IncomeBo bo,PageQuery pageQuery);
 }

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

@@ -138,4 +138,10 @@ public class IncomeServiceImpl implements IIncomeService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public TableDataInfo<IncomeVo> queryByEidList(IncomeBo bo, PageQuery pageQuery) {
+        Page<IncomeVo> result = baseMapper.selectVoPage(pageQuery.build(), Wrappers.<Income>lambdaQuery().eq(Income::getEcId, bo.getEcId()).eq(Income::getUserType, 1).eq(Income::getStatus, bo.getStatus()));
+        return TableDataInfo.build(result);
+    }
 }

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

@@ -63,7 +63,6 @@ public class StoreGoodsCategoryServiceImpl implements IStoreGoodsCategoryService
         LambdaQueryWrapper<StoreGoodsCategory> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getStoreId() != null, StoreGoodsCategory::getStoreId, bo.getStoreId());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), StoreGoodsCategory::getTitle, bo.getTitle());
-        lqw.eq(bo.getOrder() != null, StoreGoodsCategory::getOrder, bo.getOrder());
         return lqw;
     }
 

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.pz.system.domain.StoreApply;
 import com.pz.system.domain.vo.StoreApplyVo;
 import com.pz.system.mapper.StoreApplyMapper;
+import com.pz.system.mapper.StoreGoodsTagMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.pz.system.domain.bo.StoreGoodsBo;
@@ -21,6 +22,7 @@ import com.pz.system.service.IStoreGoodsService;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.Optional;
 
 /**
  * 商品Service业务层处理
@@ -36,11 +38,13 @@ public class StoreGoodsServiceImpl implements IStoreGoodsService {
 
     private final StoreApplyMapper storeApplyMapper;
 
+    private final StoreGoodsTagMapper goodsTagMapper;
+
     /**
      * 查询商品
      */
     @Override
-    public StoreGoodsVo queryById(Integer id){
+    public StoreGoodsVo queryById(Integer id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -48,7 +52,7 @@ public class StoreGoodsServiceImpl implements IStoreGoodsService {
      * 小程序查询商品
      */
     @Override
-    public StoreGoodsVo queryAppById(Integer id){
+    public StoreGoodsVo queryAppById(Integer id) {
         StoreGoodsVo storeGoodsVo = baseMapper.selectVoById(id);
         StoreGoods storeGoods = new StoreGoods();
         storeGoods.setId(id);
@@ -56,6 +60,7 @@ public class StoreGoodsServiceImpl implements IStoreGoodsService {
         baseMapper.updateById(storeGoods);
         return storeGoodsVo;
     }
+
     /**
      * 查询商品列表
      */
@@ -63,6 +68,11 @@ public class StoreGoodsServiceImpl implements IStoreGoodsService {
     public TableDataInfo<StoreGoodsVo> queryPageList(StoreGoodsBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<StoreGoods> lqw = buildQueryWrapper(bo);
         Page<StoreGoodsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Optional.ofNullable(result.getRecords()).ifPresent(storeGoodsVos -> {
+            storeGoodsVos.forEach(storeGoodsVo -> {
+
+            });
+        });
         return TableDataInfo.build(result);
     }
 
@@ -85,12 +95,12 @@ public class StoreGoodsServiceImpl implements IStoreGoodsService {
 
         //查询所有商户分类
         List<StoreApplyVo> storeApplies = storeApplyMapper.selectVoList(
-            new LambdaQueryWrapper<StoreApply>().eq(StoreApply::getStatus,1)
+            new LambdaQueryWrapper<StoreApply>().eq(StoreApply::getStatus, 1)
         );
         //查询商户下面的商品
         for (StoreApplyVo storeApply : storeApplies) {
             storeApply.setStoreGoodsVo(baseMapper.selectVoList(new LambdaQueryWrapper<StoreGoods>()
-                .eq(StoreGoods::getStoreId,storeApply.getId())));
+                .eq(StoreGoods::getStoreId, storeApply.getId())));
         }
         return storeApplies;
     }
@@ -150,7 +160,7 @@ public class StoreGoodsServiceImpl implements IStoreGoodsService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(StoreGoods entity){
+    private void validEntityBeforeSave(StoreGoods entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -159,7 +169,7 @@ public class StoreGoodsServiceImpl implements IStoreGoodsService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;

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

@@ -35,7 +35,11 @@
         so.`status` AS orderStatus,
         so.create_time AS createTime,
         tao.status as toStatus,
-        so.address_id addressId
+        so.address_id addressId,
+        so.logistics logistics,
+        so.logistics_code logisticsCode,
+        so.refund_logistics refundLogistics,
+        so.refund_logistics_code refundLogisticsCode
         FROM
         store_order AS so
         LEFT JOIN total_order AS tao ON tao.id = so.order_id
@@ -47,8 +51,8 @@
             <if test="bo.title != null and bo.title != ''">
                 and sg.title LIKE CONCAT('%', #{bo.title}, '%')
             </if>
-            <if test="bo.userId != null">
-                and si.uid = #{bo.userId}
+            <if test="bo.storeId != null">
+                and so.store_id = #{bo.storeId}
             </if>
         </where>
     </select>