服务类型修改基本完成

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "disabled"
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java

@@ -6,6 +6,8 @@ import org.springframework.context.MessageSource;
 import org.springframework.context.NoSuchMessageException;
 import org.springframework.context.i18n.LocaleContextHolder;
 
+import java.util.Locale;
+
 /**
  * 获取i18n资源文件
  *
@@ -25,7 +27,8 @@ public class MessageUtils {
      */
     public static String message(String code, Object... args) {
         try {
-            return MESSAGE_SOURCE.getMessage(code, args, LocaleContextHolder.getLocale());
+//            return MESSAGE_SOURCE.getMessage(code, args, LocaleContextHolder.getLocale());
+            return MESSAGE_SOURCE.getMessage(code, args, Locale.CHINA);
         } catch (NoSuchMessageException e) {
             return code;
         }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysAgreement.java

@@ -1,11 +1,7 @@
 package org.dromara.system.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serial;
 
 /**
  * 等级配置信息对象 sys_agreement

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/controller/SysSubOrderController.java

@@ -29,10 +29,10 @@ public class SysSubOrderController extends BaseController {
         return subOrderService.list(bo, pageQuery);
     }
 
-    @GetMapping("/listOnMerchant")
-    public TableDataInfo<SysSubOrderListPageVo> listOnMerchant(SysSubOrderListPageBo bo, PageQuery pageQuery) {
-        return subOrderService.listOnMerchant(bo, pageQuery);
-    }
+//    @GetMapping("/listOnMerchant")
+//    public TableDataInfo<SysSubOrderListPageVo> listOnMerchant(SysSubOrderListPageBo bo, PageQuery pageQuery) {
+//        return subOrderService.listOnMerchant(bo, pageQuery);
+//    }
 
     @GetMapping("/getInfo")
     public R<SysSubOrderVo> getInfo(@RequestParam Long id) {

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/SysSubOrder.java

@@ -120,9 +120,9 @@ public class SysSubOrder extends TenantEntity {
     private String toAddress;
 
     /**
-     * 价格(分)
+     * 履约佣金(分)
      */
-    private Long price;
+    private Long fulfillmentCommission;
 
     /**
      * 履约者
@@ -140,14 +140,34 @@ public class SysSubOrder extends TenantEntity {
     @TableLogic
     private String delFlag;
 
+    /**
+     * 备注
+     */
     private String remark;
 
+    /**
+     * 平台ID
+     */
     private Integer platformId;
 
+    /**
+     * 团购套餐
+     */
     private String groupPurchasePackageName;
 
+    /**
+     * 护宠小结
+     */
     private String nursingSummary;
 
+    /**
+     * 护宠小结时间
+     */
     private Date nursingSummaryTime;
 
+    /**
+     * 订单佣金(分)
+     */
+    private Long orderCommission;
+
 }

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/bo/SysSubOrderBo.java

@@ -99,9 +99,9 @@ public class SysSubOrderBo extends BaseEntity {
     private String toAddress;
 
     /**
-     * 价格(分)
+     * 履约佣金(分)
      */
-    private Long price;
+    private Long fulfillmentCommission;
 
     /**
      * 履约者

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/bo/SysSubOrderDispatchBo.java

@@ -9,6 +9,6 @@ public class SysSubOrderDispatchBo {
 
     private Long fulfiller;
 
-    private Long price;
+    private Long fulfillmentCommission;
 
 }

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/bo/SysSubOrderPendingAcceptPageBo.java

@@ -7,8 +7,8 @@ public class SysSubOrderPendingAcceptPageBo {
 
     private Long service;
 
-    private Long minPrice;
+    private Long minFulfillmentCommission;
 
-    private Long maxPrice;
+    private Long maxFulfillmentCommission;
 
 }

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/vo/SysSubOrderCountVo.java

@@ -17,6 +17,6 @@ public class SysSubOrderCountVo implements Serializable {
 
     private Long completed;
 
-    private Long price;
+    private Long fulfillmentCommission;
 
 }

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/vo/SysSubOrderListOnFulfillerVo.java

@@ -18,7 +18,7 @@ public class SysSubOrderListOnFulfillerVo implements Serializable {
 
     private Long service;
 
-    private Long price;
+    private Long fulfillmentCommission;
 
     private Date serviceTime;
 

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/vo/SysSubOrderListOnMyOrderPageVo.java

@@ -16,7 +16,7 @@ public class SysSubOrderListOnMyOrderPageVo implements Serializable {
 
     private Long service;
 
-    private Long price;
+    private Long fulfillmentCommission;
 
     private Date serviceTime;
 

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/vo/SysSubOrderListOnPetVo.java

@@ -18,7 +18,7 @@ public class SysSubOrderListOnPetVo implements Serializable {
 
     private Long service;
 
-    private Long price;
+    private Long fulfillmentCommission;
 
     private Date serviceTime;
 

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/vo/SysSubOrderListOnStoreVo.java

@@ -20,7 +20,7 @@ public class SysSubOrderListOnStoreVo implements Serializable {
 
     private String customer;
 
-    private Long price;
+    private Long fulfillmentCommission;
 
     private Date createTime;
 

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/vo/SysSubOrderListPageVo.java

@@ -61,7 +61,7 @@ public class SysSubOrderListPageVo implements Serializable {
 
     private String fulfillerStatus;
 
-    private Long price;
+    private Long fulfillmentCommission;
 
     private String remark;
 

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/vo/SysSubOrderPendingAcceptPageVo.java

@@ -16,7 +16,7 @@ public class SysSubOrderPendingAcceptPageVo implements Serializable {
 
     private Long service;
 
-    private Long price;
+    private Long fulfillmentCommission;
 
     private Date serviceTime;
 

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/vo/SysSubOrderStatisticPageVo.java

@@ -16,7 +16,7 @@ public class SysSubOrderStatisticPageVo implements Serializable {
 
     private Long service;
 
-    private Long price;
+    private Long fulfillmentCommission;
 
     private Date serviceTime;
 

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/vo/SysSubOrderVo.java

@@ -111,10 +111,10 @@ public class SysSubOrderVo implements Serializable {
     private String toAddress;
 
     /**
-     * 价格(分)
+     * 履约佣金(分)
      */
-    @ExcelProperty(value = "价格(分)")
-    private Long price;
+    @ExcelProperty(value = "履约佣金(分)")
+    private Long fulfillmentCommission;
 
     /**
      * 履约者

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/dubbo/RemoteSubOrderServiceImpl.java

@@ -41,23 +41,20 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
 
         List<Long> ids = new ArrayList<>();
 
-        baseMapper.selectList(
-            Wrappers.lambdaQuery(SysSubOrder.class)
+        baseMapper.selectList(Wrappers.lambdaQuery(SysSubOrder.class)
                 .select(SysSubOrder::getId)
-                .like(SysSubOrder::getCode, code)
-        ).forEach(e -> ids.add(e.getId()));
+                .like(SysSubOrder::getCode, code))
+            .forEach(e -> ids.add(e.getId()));
 
         return ids;
     }
 
     @Override
     public RemoteSubOrderVo getIdByCode(String code) {
-        SysSubOrder subOrder = baseMapper.selectOne(
-            Wrappers.lambdaQuery(SysSubOrder.class)
-                .select(SysSubOrder::getId, SysSubOrder::getTenantId)
-                .eq(SysSubOrder::getCode, code)
-                .last("LIMIT 1")
-        );
+        SysSubOrder subOrder = baseMapper.selectOne(Wrappers.lambdaQuery(SysSubOrder.class)
+            .select(SysSubOrder::getId, SysSubOrder::getTenantId)
+            .eq(SysSubOrder::getCode, code)
+            .last("LIMIT 1"));
 
         if (subOrder == null) {
             return null;
@@ -79,10 +76,9 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
 
         List<RemoteSubOrderVo> vos = new ArrayList<>();
 
-        baseMapper.selectList(
-                Wrappers.lambdaQuery(SysSubOrder.class)
-                    .select(SysSubOrder::getId, SysSubOrder::getCode)
-                    .in(SysSubOrder::getId, orderIds))
+        baseMapper.selectList(Wrappers.lambdaQuery(SysSubOrder.class)
+                .select(SysSubOrder::getId, SysSubOrder::getCode)
+                .in(SysSubOrder::getId, orderIds))
             .forEach(e -> {
                 RemoteSubOrderVo vo = new RemoteSubOrderVo();
                 vo.setId(e.getId());
@@ -102,18 +98,17 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
 
         List<RemoteSubOrderVo> vos = new ArrayList<>();
 
-        baseMapper.selectList(
-            Wrappers.lambdaQuery(SysSubOrder.class)
+        baseMapper.selectList(Wrappers.lambdaQuery(SysSubOrder.class)
                 .select(SysSubOrder::getFulfiller, SysSubOrder::getServiceTime)
                 .in(SysSubOrder::getFulfiller, fulfillerIds)
                 .in(SysSubOrder::getStatus, List.of(OrderStatusEnum.PENDING_SERVICE.getValue()))
-                .orderByAsc(SysSubOrder::getServiceTime)
-        ).forEach(e -> {
-            RemoteSubOrderVo vo = new RemoteSubOrderVo();
-            vo.setFulfiller(e.getFulfiller());
-            vo.setServiceTime(e.getServiceTime());
-            vos.add(vo);
-        });
+                .orderByAsc(SysSubOrder::getServiceTime))
+            .forEach(e -> {
+                RemoteSubOrderVo vo = new RemoteSubOrderVo();
+                vo.setFulfiller(e.getFulfiller());
+                vo.setServiceTime(e.getServiceTime());
+                vos.add(vo);
+            });
 
         return vos;
     }
@@ -135,10 +130,8 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
 
         List<Long> customerIds = new ArrayList<>();
 
-        baseMapper.selectList(
-                Wrappers.lambdaQuery(SysSubOrder.class).select(SysSubOrder::getUsrCustomer)
-                    .eq(SysSubOrder::getTenantId, tenantId)
-            )
+        baseMapper.selectList(Wrappers.lambdaQuery(SysSubOrder.class).select(SysSubOrder::getUsrCustomer)
+                .eq(SysSubOrder::getTenantId, tenantId))
             .forEach(e -> {
                 if (!customerIds.contains(e.getUsrCustomer())) {
                     customerIds.add(e.getUsrCustomer());
@@ -152,10 +145,8 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
     public List<Long> getPetIdsByTenantId(String tenantId) {
         List<Long> petIds = new ArrayList<>();
 
-        baseMapper.selectList(
-                Wrappers.lambdaQuery(SysSubOrder.class).select(SysSubOrder::getUsrPet)
-                    .eq(SysSubOrder::getTenantId, tenantId)
-            )
+        baseMapper.selectList(Wrappers.lambdaQuery(SysSubOrder.class).select(SysSubOrder::getUsrPet)
+                .eq(SysSubOrder::getTenantId, tenantId))
             .forEach(e -> {
                 if (!petIds.contains(e.getUsrPet())) {
                     petIds.add(e.getUsrPet());
@@ -174,17 +165,16 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
 
         List<RemoteSubOrderVo> vos = new ArrayList<>();
 
-        baseMapper.selectList(
-            Wrappers.lambdaQuery(SysSubOrder.class)
+        baseMapper.selectList(Wrappers.lambdaQuery(SysSubOrder.class)
                 .select(SysSubOrder::getId, SysSubOrder::getStore)
                 .ne(SysSubOrder::getStatus, OrderStatusEnum.CANCELLED.getValue())
-                .in(SysSubOrder::getStore, storeIds)
-        ).forEach(e -> {
-            RemoteSubOrderVo vo = new RemoteSubOrderVo();
-            vo.setId(e.getId());
-            vo.setStore(e.getStore());
-            vos.add(vo);
-        });
+                .in(SysSubOrder::getStore, storeIds))
+            .forEach(e -> {
+                RemoteSubOrderVo vo = new RemoteSubOrderVo();
+                vo.setId(e.getId());
+                vo.setStore(e.getStore());
+                vos.add(vo);
+            });
 
         return vos;
     }
@@ -193,15 +183,14 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
     public long balanceOnPending(Long userId) {
         AtomicLong result = new AtomicLong(0);
 
-        baseMapper.selectList(
-            Wrappers.lambdaQuery(SysSubOrder.class).select(SysSubOrder::getPrice)
+        baseMapper.selectList(Wrappers.lambdaQuery(SysSubOrder.class).select(SysSubOrder::getFulfillmentCommission)
                 .eq(SysSubOrder::getFulfiller, userId)
                 .notIn(SysSubOrder::getStatus, List.of(
                     OrderStatusEnum.PENDING_DISPATCH.getValue(),
                     OrderStatusEnum.PENDING_ACCEPT.getValue(),
                     OrderStatusEnum.COMPLETED.getValue(),
-                    OrderStatusEnum.CANCELLED.getValue()))
-        ).forEach(e -> result.addAndGet(e.getPrice()));
+                    OrderStatusEnum.CANCELLED.getValue())))
+            .forEach(e -> result.addAndGet(e.getFulfillmentCommission()));
 
         return result.get();
     }
@@ -211,16 +200,15 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
 
         List<RemoteSubOrderVo> vos = new ArrayList<>();
 
-        baseMapper.selectList(
-            Wrappers.lambdaQuery(SysSubOrder.class)
-                .select(SysSubOrder::getId, SysSubOrder::getPrice, SysSubOrder::getUsrCustomer)
-                .in(SysSubOrder::getUsrCustomer, customerIds)
-        ).forEach(e -> {
-            RemoteSubOrderVo vo = new RemoteSubOrderVo();
-            vo.setId(e.getId());
-            vo.setCustomer(e.getUsrCustomer());
-            vos.add(vo);
-        });
+        baseMapper.selectList(Wrappers.lambdaQuery(SysSubOrder.class)
+                .select(SysSubOrder::getId, SysSubOrder::getFulfillmentCommission, SysSubOrder::getUsrCustomer)
+                .in(SysSubOrder::getUsrCustomer, customerIds))
+            .forEach(e -> {
+                RemoteSubOrderVo vo = new RemoteSubOrderVo();
+                vo.setId(e.getId());
+                vo.setCustomer(e.getUsrCustomer());
+                vos.add(vo);
+            });
 
         return vos;
     }
@@ -228,40 +216,36 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
     @Cacheable(cacheNames = CacheNames.SYS_ORDER_CODE, key = "#id")
     @Override
     public String getCodeById(Long id) {
-        return baseMapper.selectOne(
-            Wrappers.lambdaQuery(SysSubOrder.class)
+        return baseMapper.selectOne(Wrappers.lambdaQuery(SysSubOrder.class)
                 .select(SysSubOrder::getCode)
-                .eq(SysSubOrder::getId, id)
-        ).getCode();
+                .eq(SysSubOrder::getId, id))
+            .getCode();
     }
 
     @Override
     public long countCompletedThisMonthByFulfiller(Long id) {
-        return baseMapper.selectCount(
-            Wrappers.lambdaQuery(SysSubOrder.class)
-                .eq(SysSubOrder::getFulfiller, id)
-                .eq(SysSubOrder::getStatus, OrderStatusEnum.COMPLETED.getValue())
-                .ge(SysSubOrder::getServiceTime, DateUtils.getFirstDayOfLastMonth())
-        );
+        return baseMapper.selectCount(Wrappers.lambdaQuery(SysSubOrder.class)
+            .eq(SysSubOrder::getFulfiller, id)
+            .eq(SysSubOrder::getStatus, OrderStatusEnum.COMPLETED.getValue())
+            .ge(SysSubOrder::getServiceTime, DateUtils.getFirstDayOfLastMonth()));
     }
 
     @Override
     public List<RemoteSubOrderVo> listAfterDate(Date time) {
         List<RemoteSubOrderVo> vos = new ArrayList<>();
 
-        baseMapper.selectList(
-            Wrappers.lambdaQuery(SysSubOrder.class)
-                .select(SysSubOrder::getId, SysSubOrder::getService, SysSubOrder::getPrice, SysSubOrder::getCreateTime)
-                .ge(SysSubOrder::getCreateTime, time)
-        ).forEach(e -> {
-            RemoteSubOrderVo vo = new RemoteSubOrderVo();
-            vo.setId(e.getId());
-            vo.setService(e.getService());
-            vo.setPrice(e.getPrice());
-            vo.setCreateTime(e.getCreateTime());
-            vo.setStatus(e.getStatus());
-            vos.add(vo);
-        });
+        baseMapper.selectList(Wrappers.lambdaQuery(SysSubOrder.class)
+                .select(SysSubOrder::getId, SysSubOrder::getService, SysSubOrder::getFulfillmentCommission, SysSubOrder::getCreateTime)
+                .ge(SysSubOrder::getCreateTime, time))
+            .forEach(e -> {
+                RemoteSubOrderVo vo = new RemoteSubOrderVo();
+                vo.setId(e.getId());
+                vo.setService(e.getService());
+                vo.setPrice(e.getFulfillmentCommission());
+                vo.setCreateTime(e.getCreateTime());
+                vo.setStatus(e.getStatus());
+                vos.add(vo);
+            });
 
         return vos;
     }
@@ -269,8 +253,8 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
     @Override
     public List<RemoteSubOrderVo> listAll() {
         return baseMapper.selectList(Wrappers.lambdaQuery(SysSubOrder.class)
-                .select(SysSubOrder::getId, SysSubOrder::getStore)
-            ).stream().map(e -> {
+                .select(SysSubOrder::getId, SysSubOrder::getStore))
+            .stream().map(e -> {
                 RemoteSubOrderVo vo = new RemoteSubOrderVo();
                 vo.setId(e.getId());
                 vo.setStore(e.getStore());
@@ -282,22 +266,21 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
     public List<RemoteSubOrderVo> listAfterDateEnableTenant(Date time, String tenantId) {
         List<RemoteSubOrderVo> vos = new ArrayList<>();
 
-        baseMapper.selectList(
-            Wrappers.lambdaQuery(SysSubOrder.class)
-                .select(SysSubOrder::getId, SysSubOrder::getService, SysSubOrder::getPrice, SysSubOrder::getCreateTime, SysSubOrder::getStatus, SysSubOrder::getUsrPet, SysSubOrder::getCode, SysSubOrder::getServiceTime)
-                .ge(SysSubOrder::getCreateTime, time).eq(SysSubOrder::getTenantId, tenantId)
-        ).forEach(e -> {
-            RemoteSubOrderVo vo = new RemoteSubOrderVo();
-            vo.setId(e.getId());
-            vo.setService(e.getService());
-            vo.setPrice(e.getPrice());
-            vo.setCreateTime(e.getCreateTime());
-            vo.setStatus(e.getStatus());
-            vo.setCode(e.getCode());
-            vo.setServiceTime(e.getServiceTime());
-            vo.setPet(e.getUsrPet());
-            vos.add(vo);
-        });
+        baseMapper.selectList(Wrappers.lambdaQuery(SysSubOrder.class)
+                .select(SysSubOrder::getId, SysSubOrder::getService, SysSubOrder::getFulfillmentCommission, SysSubOrder::getCreateTime, SysSubOrder::getStatus, SysSubOrder::getUsrPet, SysSubOrder::getCode, SysSubOrder::getServiceTime)
+                .ge(SysSubOrder::getCreateTime, time).eq(SysSubOrder::getTenantId, tenantId))
+            .forEach(e -> {
+                RemoteSubOrderVo vo = new RemoteSubOrderVo();
+                vo.setId(e.getId());
+                vo.setService(e.getService());
+                vo.setPrice(e.getFulfillmentCommission());
+                vo.setCreateTime(e.getCreateTime());
+                vo.setStatus(e.getStatus());
+                vo.setCode(e.getCode());
+                vo.setServiceTime(e.getServiceTime());
+                vo.setPet(e.getUsrPet());
+                vos.add(vo);
+            });
 
         return vos;
     }
@@ -309,23 +292,20 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
         SysOrderSetting setting = sysOrderSettingService.getById(1L);
         long timeout = setting.getTimeoutCancelTime();
 
-        List<SysSubOrder> orders = baseMapper.selectList(
-            Wrappers.lambdaQuery(SysSubOrder.class)
-                .eq(SysSubOrder::getStatus, OrderStatusEnum.PENDING_ACCEPT.getValue())
-        );
+        List<SysSubOrder> orders = baseMapper.selectList(Wrappers.lambdaQuery(SysSubOrder.class)
+            .eq(SysSubOrder::getStatus, OrderStatusEnum.PENDING_ACCEPT.getValue()));
         if (orders.isEmpty()) {
             return true;
         }
 
         List<Long> orderIds = new ArrayList<>();
         orders.forEach(e -> orderIds.add(e.getId()));
-        Map<Long, List<SysSubOrderLog>> logMap = subOrderLogMapper.selectList(
-            Wrappers.lambdaQuery(SysSubOrderLog.class)
+        Map<Long, List<SysSubOrderLog>> logMap = subOrderLogMapper.selectList(Wrappers.lambdaQuery(SysSubOrderLog.class)
                 .in(SysSubOrderLog::getSubOrderId, orderIds)
                 .eq(SysSubOrderLog::getActionerType, OrderLogActionerTypeEnum.SYS_USER.getValue())
                 .eq(SysSubOrderLog::getStep, OrderLogSystemStepEnum.DISPATCH.getStep())
-                .orderByDesc(SysSubOrderLog::getId)
-        ).stream()
+                .orderByDesc(SysSubOrderLog::getId))
+            .stream()
             .collect(Collectors.groupingBy(SysSubOrderLog::getSubOrderId));
 
         List<SysSubOrder> cancels = new ArrayList<>();

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/service/ISysSubOrderService.java

@@ -16,7 +16,7 @@ public interface ISysSubOrderService {
 
     SysSubOrderVo getInfo(Long id);
 
-    TableDataInfo<SysSubOrderListPageVo> listOnMerchant(SysSubOrderListPageBo bo, PageQuery pageQuery);
+//    TableDataInfo<SysSubOrderListPageVo> listOnMerchant(SysSubOrderListPageBo bo, PageQuery pageQuery);
 
     TableDataInfo<SysSubOrderPendingAcceptPageVo> listPendingAccept(SysSubOrderPendingAcceptPageBo bo, PageQuery pageQuery);
 

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/service/impl/SysSubOrderServiceImpl.java

@@ -160,7 +160,7 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
                 vo.setFulfillerName(fulfiller.getName());
                 vo.setFulfillerStatus(fulfiller.getStatus());
             }
-            vo.setPrice(e.getPrice());
+            vo.setFulfillmentCommission(e.getFulfillmentCommission());
             vo.setRemark(e.getRemark());
             vo.setNursingSummary(e.getNursingSummary());
             vo.setNursingSummaryTime(e.getNursingSummaryTime());
@@ -174,7 +174,7 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
 
         SysSubOrder subOrder = baseMapper.selectById(bo.getOrderId());
         subOrder.setFulfiller(bo.getFulfiller());
-        subOrder.setPrice(bo.getPrice());
+        subOrder.setFulfillmentCommission(bo.getFulfillmentCommission());
         subOrder.setStatus(OrderStatusEnum.PENDING_ACCEPT.getValue());
 
         boolean orderFlag = baseMapper.updateById(subOrder) == 0;
@@ -254,97 +254,95 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
         return baseMapper.selectVoById(id);
     }
 
-    @Override
-    public TableDataInfo<SysSubOrderListPageVo> listOnMerchant(SysSubOrderListPageBo bo, PageQuery pageQuery) {
-
-        LambdaQueryWrapper<SysSubOrder> orderWrapper = Wrappers.lambdaQuery(SysSubOrder.class);
-
-        if (StringUtils.isNotBlank(bo.getContent())) {
-            List<Long> storeIds = remoteStoreService.selectIdsByName(bo.getContent());
-//            orderWrapper.in(SysSubOrder::getStore, WrapperUtils.convertIds(storeIds));
-            List<Long> userIds = remoteUserService.selectUserIdsByName(bo.getContent());
-//            orderWrapper.in(SysSubOrder::getOrderPlacer, WrapperUtils.convertIds(userIds));
-            List<Long> customerIds = remoteCustomerService.selectIdsByName(bo.getContent());
-//            orderWrapper.in(SysSubOrder::getUsrCustomer, WrapperUtils.convertIds(customerIds));
-            orderWrapper.and(w -> w
-                .in(SysSubOrder::getStore, WrapperUtils.convertIds(storeIds)).or()
-                .in(SysSubOrder::getOrderPlacer, WrapperUtils.convertIds(userIds)).or()
-                .in(SysSubOrder::getUsrCustomer, WrapperUtils.convertIds(customerIds))
-            );
-
-        }
-
-        Page<SysSubOrder> page = baseMapper.selectPage(
-            pageQuery.build(),
-            orderWrapper.orderByDesc(SysSubOrder::getId)
-                .eq(bo.getStatus() != null, SysSubOrder::getStatus, bo.getStatus())
-                .eq(bo.getService() != null, SysSubOrder::getService, bo.getService())
-        );
-
-        List<Long> petIds = new ArrayList<>();
-        List<Long> storeIds = new ArrayList<>();
-        List<Long> customerIds = new ArrayList<>();
-        List<Long> userIds = new ArrayList<>();
-        List<Long> fulfillerIds = new ArrayList<>();
-        page.getRecords().forEach(e -> {
-            petIds.add(e.getUsrPet());
-            customerIds.add(e.getUsrCustomer());
-            storeIds.add(e.getStore());
-            userIds.add(e.getOrderPlacer());
-            if (e.getFulfiller() != null) {
-                fulfillerIds.add(e.getFulfiller());
-            }
-        });
-        Map<Long, RemotePetVo> petMap = new HashMap<>();
-        Map<Long, RemoteStoreVo> storeMap = new HashMap<>();
-        Map<Long, RemoteCustomerVo> customerMap = new HashMap<>();
-        Map<Long, RemoteUserVo> userMap = new HashMap<>();
-        Map<Long, RemoteFulfillerVo> fulfillerMap = new HashMap<>();
-        remotePetService.getByIds(petIds).forEach(e -> petMap.put(e.getId(), e));
-        remoteStoreService.getByIds(storeIds).forEach(e -> storeMap.put(e.getId(), e));
-        remoteUserService.getByIds(userIds).forEach(e -> userMap.put(e.getUserId(), e));
-        remoteCustomerService.getByIds(customerIds).forEach(e -> customerMap.put(e.getId(), e));
-        remoteFulfillerService.getByIds(fulfillerIds).forEach(e -> fulfillerMap.put(e.getId(), e));
-
-        return TableDataInfo.build(page.convert(e -> {
-            SysSubOrderListPageVo vo = new SysSubOrderListPageVo();
-            vo.setId(e.getId());
-            vo.setCode(e.getCode());
-            vo.setService(e.getService());
-            vo.setServiceTime(e.getServiceTime());
-            vo.setMode(e.getMode());
-            vo.setType(e.getType());
-            vo.setPet(e.getUsrPet());
-            RemotePetVo pet = petMap.get(e.getUsrPet());
-            vo.setPetName(pet.getName());
-            vo.setPetBreed(pet.getBreed());
-            vo.setCustomer(e.getUsrCustomer());
-            RemoteCustomerVo customer = customerMap.get(e.getUsrCustomer());
-            vo.setCustomerName(customer.getName());
-            vo.setToAddress(e.getToAddress());
-            vo.setSite(e.getStoreSite());
-            vo.setStore(e.getStore());
-            RemoteStoreVo store = storeMap.get(e.getStore());
-            vo.setStoreName(store.getName());
-            vo.setPlacer(e.getOrderPlacer());
-            RemoteUserVo placer = userMap.get(e.getOrderPlacer());
-            vo.setPlacerUsername(placer.getUserName());
-            vo.setCreateTime(e.getCreateTime());
-            vo.setStatus(e.getStatus());
-            vo.setFulfiller(e.getFulfiller());
-            RemoteFulfillerVo fulfiller = fulfillerMap.get(e.getFulfiller());
-            if (fulfiller != null) {
-                vo.setFulfillerName(fulfiller.getName());
-                vo.setFulfillerStatus(fulfiller.getStatus());
-            }
-            vo.setPrice(e.getPrice());
-            vo.setRemark(e.getRemark());
-            vo.setNursingSummary(e.getNursingSummary());
-            vo.setNursingSummaryTime(e.getNursingSummaryTime());
-            return vo;
-        }));
-
-    }
+//    @Override
+//    public TableDataInfo<SysSubOrderListPageVo> listOnMerchant(SysSubOrderListPageBo bo, PageQuery pageQuery) {
+//
+//        LambdaQueryWrapper<SysSubOrder> orderWrapper = Wrappers.lambdaQuery(SysSubOrder.class);
+//
+//        if (StringUtils.isNotBlank(bo.getContent())) {
+//            List<Long> storeIds = remoteStoreService.selectIdsByName(bo.getContent());
+//            List<Long> userIds = remoteUserService.selectUserIdsByName(bo.getContent());
+//            List<Long> customerIds = remoteCustomerService.selectIdsByName(bo.getContent());
+//            orderWrapper.and(w -> w
+//                .in(SysSubOrder::getStore, WrapperUtils.convertIds(storeIds))
+//                .or()
+//                .in(SysSubOrder::getOrderPlacer, WrapperUtils.convertIds(userIds))
+//                .or()
+//                .in(SysSubOrder::getUsrCustomer, WrapperUtils.convertIds(customerIds))
+//            );
+//        }
+//
+//        Page<SysSubOrder> page = baseMapper.selectPage(
+//            pageQuery.build(),
+//            orderWrapper.orderByDesc(SysSubOrder::getId)
+//                .eq(bo.getStatus() != null, SysSubOrder::getStatus, bo.getStatus())
+//                .eq(bo.getService() != null, SysSubOrder::getService, bo.getService())
+//        );
+//
+//        List<Long> petIds = new ArrayList<>();
+//        List<Long> storeIds = new ArrayList<>();
+//        List<Long> customerIds = new ArrayList<>();
+//        List<Long> userIds = new ArrayList<>();
+//        List<Long> fulfillerIds = new ArrayList<>();
+//        page.getRecords().forEach(e -> {
+//            petIds.add(e.getUsrPet());
+//            customerIds.add(e.getUsrCustomer());
+//            storeIds.add(e.getStore());
+//            userIds.add(e.getOrderPlacer());
+//            if (e.getFulfiller() != null) {
+//                fulfillerIds.add(e.getFulfiller());
+//            }
+//        });
+//        Map<Long, RemotePetVo> petMap = new HashMap<>();
+//        Map<Long, RemoteStoreVo> storeMap = new HashMap<>();
+//        Map<Long, RemoteCustomerVo> customerMap = new HashMap<>();
+//        Map<Long, RemoteUserVo> userMap = new HashMap<>();
+//        Map<Long, RemoteFulfillerVo> fulfillerMap = new HashMap<>();
+//        remotePetService.getByIds(petIds).forEach(e -> petMap.put(e.getId(), e));
+//        remoteStoreService.getByIds(storeIds).forEach(e -> storeMap.put(e.getId(), e));
+//        remoteUserService.getByIds(userIds).forEach(e -> userMap.put(e.getUserId(), e));
+//        remoteCustomerService.getByIds(customerIds).forEach(e -> customerMap.put(e.getId(), e));
+//        remoteFulfillerService.getByIds(fulfillerIds).forEach(e -> fulfillerMap.put(e.getId(), e));
+//
+//        return TableDataInfo.build(page.convert(e -> {
+//            SysSubOrderListPageVo vo = new SysSubOrderListPageVo();
+//            vo.setId(e.getId());
+//            vo.setCode(e.getCode());
+//            vo.setService(e.getService());
+//            vo.setServiceTime(e.getServiceTime());
+//            vo.setMode(e.getMode());
+//            vo.setType(e.getType());
+//            vo.setPet(e.getUsrPet());
+//            RemotePetVo pet = petMap.get(e.getUsrPet());
+//            vo.setPetName(pet.getName());
+//            vo.setPetBreed(pet.getBreed());
+//            vo.setCustomer(e.getUsrCustomer());
+//            RemoteCustomerVo customer = customerMap.get(e.getUsrCustomer());
+//            vo.setCustomerName(customer.getName());
+//            vo.setToAddress(e.getToAddress());
+//            vo.setSite(e.getStoreSite());
+//            vo.setStore(e.getStore());
+//            RemoteStoreVo store = storeMap.get(e.getStore());
+//            vo.setStoreName(store.getName());
+//            vo.setPlacer(e.getOrderPlacer());
+//            RemoteUserVo placer = userMap.get(e.getOrderPlacer());
+//            vo.setPlacerUsername(placer.getUserName());
+//            vo.setCreateTime(e.getCreateTime());
+//            vo.setStatus(e.getStatus());
+//            vo.setFulfiller(e.getFulfiller());
+//            RemoteFulfillerVo fulfiller = fulfillerMap.get(e.getFulfiller());
+//            if (fulfiller != null) {
+//                vo.setFulfillerName(fulfiller.getName());
+//                vo.setFulfillerStatus(fulfiller.getStatus());
+//            }
+//            vo.setFulfillmentCommission(e.getFulfillmentCommission());
+//            vo.setRemark(e.getRemark());
+//            vo.setNursingSummary(e.getNursingSummary());
+//            vo.setNursingSummaryTime(e.getNursingSummaryTime());
+//            return vo;
+//        }));
+//
+//    }
 
     @Override
     public TableDataInfo<SysSubOrderPendingAcceptPageVo> listPendingAccept(SysSubOrderPendingAcceptPageBo bo, PageQuery pageQuery) {
@@ -353,8 +351,8 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
             pageQuery.build(),
             Wrappers.lambdaQuery(SysSubOrder.class)
                 .eq(bo.getService() != null, SysSubOrder::getService, bo.getService())
-                .le(bo.getMaxPrice() != null, SysSubOrder::getPrice, bo.getMaxPrice())
-                .ge(bo.getMinPrice() != null, SysSubOrder::getPrice, bo.getMinPrice())
+                .le(bo.getMaxFulfillmentCommission() != null, SysSubOrder::getFulfillmentCommission, bo.getMaxFulfillmentCommission())
+                .ge(bo.getMinFulfillmentCommission() != null, SysSubOrder::getFulfillmentCommission, bo.getMinFulfillmentCommission())
                 .eq(SysSubOrder::getFulfiller, LoginHelper.getUserId())
                 .eq(SysSubOrder::getStatus, OrderStatusEnum.PENDING_ACCEPT.getValue())
                 .orderByDesc(SysSubOrder::getId)
@@ -384,7 +382,7 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
             SysSubOrderPendingAcceptPageVo vo = new SysSubOrderPendingAcceptPageVo();
             vo.setId(e.getId());
             vo.setService(e.getService());
-            vo.setPrice(e.getPrice());
+            vo.setFulfillmentCommission(e.getFulfillmentCommission());
             vo.setServiceTime(e.getServiceTime());
             vo.setPet(e.getUsrPet());
             RemotePetVo pet = petMap.get(e.getUsrPet());
@@ -469,7 +467,7 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
         List<Long> total = new ArrayList<>();
         List<Long> reject = new ArrayList<>();
         List<Long> completed = new ArrayList<>();
-        AtomicLong price = new AtomicLong(0L);
+        AtomicLong fulfillmentCommission = new AtomicLong(0L);
 
         subOrderLogMapper.selectList(
             Wrappers.lambdaQuery(SysSubOrderLog.class)
@@ -493,12 +491,12 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
         baseMapper.selectList(
             Wrappers.lambdaQuery(SysSubOrder.class)
                 .in(SysSubOrder::getId, WrapperUtils.convertIds(completed))
-        ).forEach(e -> price.addAndGet(e.getPrice()));
+        ).forEach(e -> fulfillmentCommission.addAndGet(e.getFulfillmentCommission()));
 
         vo.setTotal((long) total.size());
         vo.setReject((long) reject.size());
         vo.setCompleted((long) completed.size());
-        vo.setPrice(price.get());
+        vo.setFulfillmentCommission(fulfillmentCommission.get());
         return vo;
     }
 
@@ -575,7 +573,7 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
             logs.add(endSysLog);
 
             // 履约者拿到佣金
-            boolean fulfillerFlag = remoteFulfillerService.settlement(subOrder.getFulfiller(), subOrder.getPrice(), subOrder.getCode(), subOrder.getId());
+            boolean fulfillerFlag = remoteFulfillerService.settlement(subOrder.getFulfiller(), subOrder.getFulfillmentCommission(), subOrder.getCode(), subOrder.getId());
             if (!fulfillerFlag) {
                 throw new RuntimeException("履约者新增佣金失败");
             }
@@ -630,7 +628,7 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
             SysSubOrderListOnMyOrderPageVo vo = new SysSubOrderListOnMyOrderPageVo();
             vo.setId(e.getId());
             vo.setService(e.getService());
-            vo.setPrice(e.getPrice());
+            vo.setFulfillmentCommission(e.getFulfillmentCommission());
             vo.setServiceTime(e.getServiceTime());
             vo.setPet(e.getUsrPet());
             RemotePetVo pet = petMap.get(e.getUsrPet());
@@ -696,7 +694,7 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
         }
 
         // 履约者拿到佣金
-        boolean fulfillerFlag = remoteFulfillerService.settlement(subOrder.getFulfiller(), subOrder.getPrice(), subOrder.getCode(), subOrder.getId());
+        boolean fulfillerFlag = remoteFulfillerService.settlement(subOrder.getFulfiller(), subOrder.getFulfillmentCommission(), subOrder.getCode(), subOrder.getId());
         if (!fulfillerFlag) {
             throw new RuntimeException("履约者新增佣金失败");
         }
@@ -819,7 +817,7 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
                 vo.setId(e.getId());
                 vo.setCode(e.getCode());
                 vo.setService(e.getService());
-                vo.setPrice(e.getPrice());
+                vo.setFulfillmentCommission(e.getFulfillmentCommission());
                 vo.setServiceTime(e.getServiceTime());
                 vo.setStatus(e.getStatus());
                 vos.add(vo);
@@ -843,7 +841,7 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
                 vo.setId(e.getId());
                 vo.setCode(e.getCode());
                 vo.setService(e.getService());
-                vo.setPrice(e.getPrice());
+                vo.setFulfillmentCommission(e.getFulfillmentCommission());
                 vo.setServiceTime(e.getServiceTime());
                 vo.setStatus(e.getStatus());
                 vos.add(vo);
@@ -873,7 +871,7 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
             vo.setCode(e.getCode());
             vo.setService(e.getService());
             vo.setCustomer(customerMap.get(e.getUsrCustomer()).getName());
-            vo.setPrice(e.getPrice());
+            vo.setFulfillmentCommission(e.getFulfillmentCommission());
             vo.setCreateTime(e.getCreateTime());
             vo.setStatus(e.getStatus());
             return vo;
@@ -913,7 +911,7 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
             SysSubOrderStatisticPageVo vo = new SysSubOrderStatisticPageVo();
             vo.setId(e.getId());
             vo.setService(e.getService());
-            vo.setPrice(e.getPrice());
+            vo.setFulfillmentCommission(e.getFulfillmentCommission());
             vo.setServiceTime(e.getServiceTime());
             vo.setPet(e.getUsrPet());
             RemotePetVo pet = petMap.get(e.getUsrPet());

ruoyi-modules/yingpaipay-service/src/main/java/org/dromara/service/domain/SysService.java

@@ -83,4 +83,6 @@ public class SysService extends BaseEntity {
 
     private Long classificationId;
 
+    private Long price;
+
 }

ruoyi-modules/yingpaipay-service/src/main/java/org/dromara/service/domain/bo/SysServiceBo.java

@@ -68,4 +68,6 @@ public class SysServiceBo extends BaseEntity {
     @NotNull(message = "所属分类不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long classificationId;
 
+    private Long price;
+
 }

ruoyi-modules/yingpaipay-service/src/main/java/org/dromara/service/domain/vo/SysServiceClassificationVo.java

@@ -54,5 +54,4 @@ public class SysServiceClassificationVo implements Serializable {
     @ExcelProperty(value = "创建时间")
     private Date createTime;
 
-
 }

ruoyi-modules/yingpaipay-service/src/main/java/org/dromara/service/domain/vo/SysServiceVo.java

@@ -89,4 +89,6 @@ public class SysServiceVo implements Serializable {
 
     private Long classificationId;
 
+    private Long price;
+
 }

script/sql/business/v2/update.sql

@@ -1,5 +1,5 @@
-ALTER TABLE pet_system.sys_service ADD COLUMN `introduction` text COMMENT '服务介绍';
-ALTER TABLE pet_system.sys_service ADD COLUMN `order_instruction` text COMMENT '下单须知';
+ALTER TABLE pet_system.sys_service ADD COLUMN introduction text COMMENT '服务介绍';
+ALTER TABLE pet_system.sys_service ADD COLUMN order_instruction text COMMENT '下单须知';
 
 -- 菜单 SQL
 insert into pet_system.sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, platform_id)
@@ -20,4 +20,9 @@ ALTER TABLE pet_system.sys_service ADD COLUMN classification_id bigint COMMENT '
 UPDATE pet_system.sys_menu SET parent_id = 2020736413590941698, menu_name = '服务列表', order_num = 2, path = 'list', component = 'service/list/index', is_frame = '1', is_cache = '0', menu_type = 'C', visible = '0', status = '0', perms = 'service:list:list', icon = 'service-list', remark = '服务列表菜单', platform_id = 0, create_dept = 103, create_time = '2026-02-25 13:44:44', update_by = 1, update_time = '2026-03-27 17:55:14' WHERE menu_id = 2026533580326912001
 
 INSERT INTO pet_system.sys_agreement(id, title, content)
-VALUES (4, '托运协议', '托运协议')
+VALUES (4, '托运协议', '托运协议');
+
+ALTER TABLE pet_system.sys_service ADD COLUMN price bigint COMMENT '订单服务费';
+
+ALTER TABLE pet_system.sys_sub_order ADD COLUMN order_commission bigint COMMENT '订单佣金';
+ALTER TABLE pet_system.sys_sub_order CHANGE price fulfillment_commission bigint COMMENT '履约佣金';