全面整改完成

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/AdminIndexController.java

@@ -54,10 +54,10 @@ public class AdminIndexController extends BaseController {
         for (RemoteSubOrderVo order : orders) {
             if (order.getCreateTime().before(DateUtils.getDateDaysAgo(0L))) {
                 countLastday++;
-                priceLastday += order.getPrice();
+                priceLastday += order.getPrice() != null ? order.getPrice() : 0L;
             } else {
                 countToday++;
-                priceToday += order.getPrice();
+                priceToday += order.getPrice() != null ? order.getPrice() : 0L;
             }
         }
         vo.setPriceToday(priceToday);

ruoyi-modules/yingpaipay-archieves/src/main/java/org/dromara/archieves/constants/ChangeLogTargetConstants.java

@@ -0,0 +1,9 @@
+package org.dromara.archieves.constants;
+
+public interface ChangeLogTargetConstants {
+
+    String CUSTOMER = "customer";
+
+    String PET = "pet";
+
+}

ruoyi-modules/yingpaipay-archieves/src/main/java/org/dromara/archieves/constants/ChangeLogTypeConstants.java

@@ -2,10 +2,20 @@ package org.dromara.archieves.constants;
 
 public interface ChangeLogTypeConstants {
 
-    String REMARK = "remark";
+    /**
+     * 关于宠物
+     */
+    // 宠物备注
+    String PET_REMARK = "pet_remark";
 
-    String SYSTEM = "system";
-
-    String CHANGE = "change";
+    /**
+     * 关于用户
+     */
+    String CUSTOMER_ADD_PET = "customer_add_pet";
+    String CUSTOMER_CREATE = "customer_create";
+    String CUSTOMER_EDIT = "customer_edit";
+    String CUSTOMER_CHANGE_STATUS = "customer_change_satus";
+    String CUSTOMER_REMOVE = "customer_remove";
+    String CUSTOMER_REMARK = "customer_remark";
 
 }

ruoyi-modules/yingpaipay-archieves/src/main/java/org/dromara/archieves/controller/UsrCustomerController.java

@@ -7,6 +7,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import net.sf.jsqlparser.schema.Table;
+import org.dromara.archieves.domain.bo.UsrCustomerRemarkBo;
 import org.dromara.archieves.domain.vo.UsrCustomerOnOrderVo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -126,6 +127,7 @@ public class UsrCustomerController extends BaseController {
      */
     //@SaCheckPermission("archieves:customer:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
     @PutMapping("/changeStatus")
     public R<Void> changeStatus(@RequestParam Long id, @RequestParam Integer status) {
         return toAjax(usrCustomerService.changeStatus(id, status));
@@ -134,9 +136,16 @@ public class UsrCustomerController extends BaseController {
     @GetMapping("/listOnOrder")
     public TableDataInfo<UsrCustomerOnOrderVo> listOnOrder(
         @RequestParam(name = "content", required = false) String content,
+        @RequestParam(name = "tenantId", required = false) String tenantId,
         PageQuery pageQuery
     ) {
-        return usrCustomerService.listOnOrder(content, pageQuery);
+        return usrCustomerService.listOnOrder(content, tenantId, pageQuery);
+    }
+
+    @RepeatSubmit()
+    @PostMapping("/remark")
+    public R<Void> remark(@RequestBody UsrCustomerRemarkBo bo) {
+        return toAjax(usrCustomerService.remark(bo));
     }
 
 }

ruoyi-modules/yingpaipay-archieves/src/main/java/org/dromara/archieves/domain/bo/UsrCustomerRemarkBo.java

@@ -0,0 +1,12 @@
+package org.dromara.archieves.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class UsrCustomerRemarkBo {
+
+    private Long id;
+
+    private String content;
+
+}

ruoyi-modules/yingpaipay-archieves/src/main/java/org/dromara/archieves/service/IUsrCustomerService.java

@@ -1,5 +1,6 @@
 package org.dromara.archieves.service;
 
+import org.dromara.archieves.domain.bo.UsrCustomerRemarkBo;
 import org.dromara.archieves.domain.vo.UsrCustomerOnOrderVo;
 import org.dromara.archieves.domain.vo.UsrCustomerVo;
 import org.dromara.archieves.domain.bo.UsrCustomerBo;
@@ -52,5 +53,7 @@ public interface IUsrCustomerService {
      */
     Boolean changeStatus(Long id, Integer status);
 
-    TableDataInfo<UsrCustomerOnOrderVo> listOnOrder(String name, PageQuery pageQuery);
+    TableDataInfo<UsrCustomerOnOrderVo> listOnOrder(String name, String tenantId, PageQuery pageQuery);
+
+    boolean remark(UsrCustomerRemarkBo bo);
 }

ruoyi-modules/yingpaipay-archieves/src/main/java/org/dromara/archieves/service/impl/UsrCustomerServiceImpl.java

@@ -1,7 +1,10 @@
 package org.dromara.archieves.service.impl;
 
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.archieves.constants.ChangeLogTargetConstants;
+import org.dromara.archieves.constants.ChangeLogTypeConstants;
 import org.dromara.archieves.domain.UsrPet;
+import org.dromara.archieves.domain.bo.UsrCustomerRemarkBo;
 import org.dromara.archieves.domain.vo.UsrCustomerOnOrderVo;
 import org.dromara.archieves.enums.UsrCustomerTabEnum;
 import org.dromara.archieves.mapper.UsrPetMapper;
@@ -161,7 +164,7 @@ public class UsrCustomerServiceImpl implements IUsrCustomerService {
         if (flag) {
             bo.setId(add.getId());
             saveTagRels(add.getId(), bo.getTagIds(), TagTargetConstants.CUSTOMER);
-            arcChangeLogService.addLog(add.getId(), TagTargetConstants.CUSTOMER, "创建", "用户已被创建");
+            arcChangeLogService.addLog(add.getId(), ChangeLogTargetConstants.CUSTOMER, ChangeLogTypeConstants.CUSTOMER_CREATE, "用户已被创建");
         }
         CacheUtils.put(CacheNames.USR_CUSTOMER_NAME, add.getId(), add.getName());
         return flag;
@@ -175,12 +178,13 @@ public class UsrCustomerServiceImpl implements IUsrCustomerService {
         boolean flag = baseMapper.updateById(update) > 0;
         if (flag) {
             saveTagRels(bo.getId(), bo.getTagIds(), TagTargetConstants.CUSTOMER);
-            // 如果有备注内容，记录备注日志；否则记录编辑日志
-            if (StringUtils.isNotBlank(bo.getRemark())) {
-                arcChangeLogService.addLog(bo.getId(), TagTargetConstants.CUSTOMER, "备注", bo.getRemark());
-            } else {
-                arcChangeLogService.addLog(bo.getId(), TagTargetConstants.CUSTOMER, "编辑", "用户信息已修改");
-            }
+            arcChangeLogService.addLog(bo.getId(), ChangeLogTargetConstants.CUSTOMER, ChangeLogTypeConstants.CUSTOMER_EDIT, "用户信息已修改");
+//            // 如果有备注内容，记录备注日志；否则记录编辑日志
+//            if (StringUtils.isNotBlank(bo.getRemark())) {
+//                arcChangeLogService.addLog(bo.getId(), TagTargetConstants.CUSTOMER, "备注", bo.getRemark());
+//            } else {
+//                arcChangeLogService.addLog(bo.getId(), TagTargetConstants.CUSTOMER, "编辑", "用户信息已修改");
+//            }
         }
         CacheUtils.put(CacheNames.USR_CUSTOMER_NAME, update.getId(), update.getName());
         return flag;
@@ -196,7 +200,7 @@ public class UsrCustomerServiceImpl implements IUsrCustomerService {
             //TODO 做一些业务上的校验
         }
         // 记录删除日志
-        ids.forEach(id -> arcChangeLogService.addLog(id, TagTargetConstants.CUSTOMER, "删除", "用户已被删除"));
+        ids.forEach(id -> arcChangeLogService.addLog(id, ChangeLogTargetConstants.CUSTOMER, ChangeLogTypeConstants.CUSTOMER_REMOVE, "用户已被删除"));
         // 删除标签关联
         ids.forEach(id -> {
             tagRelMapper.delete(
@@ -217,13 +221,13 @@ public class UsrCustomerServiceImpl implements IUsrCustomerService {
         boolean flag = baseMapper.updateById(update) > 0;
         if (flag) {
             String statusText = (status != null && status == 0) ? "启用" : "停用";
-            arcChangeLogService.addLog(id, TagTargetConstants.CUSTOMER, "状态变更", "用户状态变更为 " + statusText);
+            arcChangeLogService.addLog(id, ChangeLogTargetConstants.CUSTOMER, ChangeLogTypeConstants.CUSTOMER_CHANGE_STATUS, "用户状态变更为 " + statusText);
         }
         return flag;
     }
 
     @Override
-    public TableDataInfo<UsrCustomerOnOrderVo> listOnOrder(String content, PageQuery pageQuery) {
+    public TableDataInfo<UsrCustomerOnOrderVo> listOnOrder(String content, String tenantId, PageQuery pageQuery) {
 
         Page<UsrCustomer> page = baseMapper.selectPage(
             pageQuery.build(),
@@ -233,6 +237,7 @@ public class UsrCustomerServiceImpl implements IUsrCustomerService {
                     .or()
                     .like(UsrCustomer::getPhone, content)
                 )
+                .eq(StringUtils.isNotBlank(tenantId), UsrCustomer::getTenantId, tenantId)
                 .orderByDesc(UsrCustomer::getId)
         );
 
@@ -248,6 +253,11 @@ public class UsrCustomerServiceImpl implements IUsrCustomerService {
 
     }
 
+    @Override
+    public boolean remark(UsrCustomerRemarkBo bo) {
+        return arcChangeLogService.addLog(bo.getId(), ChangeLogTargetConstants.CUSTOMER, ChangeLogTypeConstants.CUSTOMER_REMARK, bo.getContent());
+    }
+
     /**
      * 查询目标关联的标签列表
      */

ruoyi-modules/yingpaipay-archieves/src/main/java/org/dromara/archieves/service/impl/UsrPetServiceImpl.java

@@ -31,6 +31,7 @@ import org.dromara.archieves.domain.vo.SysTagVo;
 import org.dromara.archieves.service.IArcChangeLogService;
 import org.dromara.archieves.service.IUsrPetService;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Collection;
 import java.util.Collections;
@@ -142,7 +143,7 @@ public class UsrPetServiceImpl implements IUsrPetService {
 //            // 更新用户宠物数量
 //            updateCustomerPetCount(bo.getUserId());
                 // 记录到用户的档案日志
-                arcChangeLogService.addLog(bo.getUserId(), TagTargetConstants.CUSTOMER, "新增宠物", "新增宠物档案 (" + bo.getName() + ")");
+                arcChangeLogService.addLog(bo.getUserId(), TagTargetConstants.CUSTOMER, ChangeLogTypeConstants.CUSTOMER_ADD_PET, "新增宠物档案 (" + bo.getName() + ")");
             }
             return flag;
         });
@@ -157,9 +158,9 @@ public class UsrPetServiceImpl implements IUsrPetService {
         if (flag) {
             saveTagRels(bo.getId(), bo.getTagIds(), TagTargetConstants.PET);
             // 如果有备注内容，记录变更日志
-            if (StringUtils.isNotBlank(bo.getRemark())) {
-                arcChangeLogService.addLog(bo.getId(), TagTargetConstants.PET, "备注", bo.getRemark());
-            }
+//            if (StringUtils.isNotBlank(bo.getRemark())) {
+//                arcChangeLogService.addLog(bo.getId(), TagTargetConstants.PET, "备注", bo.getRemark());
+//            }
         }
         return flag;
     }
@@ -179,7 +180,7 @@ public class UsrPetServiceImpl implements IUsrPetService {
         // 记录删除宠物日志到用户的档案日志
         for (UsrPet pet : pets) {
             if (pet.getUserId() != null) {
-                arcChangeLogService.addLog(pet.getUserId(), TagTargetConstants.CUSTOMER, "删除宠物", "删除宠物档案 (" + pet.getName() + ")");
+                arcChangeLogService.addLog(pet.getUserId(), TagTargetConstants.CUSTOMER, ChangeLogTypeConstants.PET_REMARK, "删除宠物档案 (" + pet.getName() + ")");
             }
         }
         // 删除标签关联
@@ -211,10 +212,11 @@ public class UsrPetServiceImpl implements IUsrPetService {
         log.setTenantId(pet.getTenantId());
         log.setTargetId(pet.getId());
         log.setTargetType(ChangeLogTargetTypeConstants.PET);
-        log.setLogType(ChangeLogTypeConstants.REMARK);
+        log.setLogType(ChangeLogTypeConstants.PET_REMARK);
         log.setContent(bo.getContent());
         log.setOperatorId(LoginHelper.getUserId());
         log.setOperatorName(LoginHelper.getLoginUser().getNickname());
+        log.setCreateTime(new Date());
         boolean logFlag = arcChangeLogMapper.insert(log) == 0;
         if (logFlag) {
             throw new RuntimeException("新增日志失败");

ruoyi-modules/yingpaipay-fulfiller/src/main/java/org/dromara/fulfiller/controller/FlfAnamalyController.java

@@ -45,6 +45,7 @@ public class FlfAnamalyController extends BaseController {
         return toAjax(flfAnamalyService.delete(id));
     }
 
+    @RepeatSubmit()
     @PostMapping("/upload")
     public R<Void> upload(@RequestBody FlfAnamalyUploadBo bo) {
         return toAjax(flfAnamalyService.upload(bo));

ruoyi-modules/yingpaipay-fulfiller/src/main/java/org/dromara/fulfiller/controller/FlfAppController.java

@@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.fulfiller.domain.bo.FlfAuditBo;
 import org.dromara.fulfiller.service.IFlfAuditService;
 import org.dromara.resource.api.RemoteFileService;
@@ -91,6 +92,7 @@ public class FlfAppController {
     /**
      * 提交入驻申请（App端，无需登录）
      */
+    @RepeatSubmit()
     @PostMapping("/audit/submit")
     public R<Void> submitAudit(@Validated(AddGroup.class) @RequestBody FlfAuditBo bo) {
         bo.setType("register");

ruoyi-modules/yingpaipay-fulfiller/src/main/java/org/dromara/fulfiller/controller/FlfAuditController.java

@@ -3,6 +3,7 @@ package org.dromara.fulfiller.controller;
 import lombok.RequiredArgsConstructor;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.log.annotation.Log;
@@ -62,6 +63,7 @@ public class FlfAuditController extends BaseController {
      * 审核通过
      */
     //@SaCheckPermission("fulfiller:audit:edit")
+    @RepeatSubmit()
     @Log(title = "履约者审核", businessType = BusinessType.UPDATE)
     @PutMapping("/pass/{id}")
     public R<Void> pass(@NotNull(message = "主键不能为空")
@@ -73,6 +75,7 @@ public class FlfAuditController extends BaseController {
      * 审核驳回
      */
     //@SaCheckPermission("fulfiller:audit:edit")
+    @RepeatSubmit()
     @Log(title = "履约者审核", businessType = BusinessType.UPDATE)
     @PutMapping("/reject/{id}")
     public R<Void> reject(@NotNull(message = "主键不能为空")

ruoyi-modules/yingpaipay-fulfiller/src/main/java/org/dromara/fulfiller/controller/FlfFulfillerController.java

@@ -65,6 +65,7 @@ public class FlfFulfillerController extends BaseController {
      * @author steelwei
      */
     @Log(title = "履约者-修改头像", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
     @PutMapping("/my/avatar")
     public R<Void> updateMyAvatar(@RequestBody Map<String, String> params) {
         Long userId = LoginHelper.getUserId();
@@ -76,6 +77,7 @@ public class FlfFulfillerController extends BaseController {
      * @author steelwei
      */
     @Log(title = "履约者-修改姓名", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
     @PutMapping("/my/name")
     public R<Void> updateMyName(@RequestBody Map<String, String> params) {
         Long userId = LoginHelper.getUserId();
@@ -87,6 +89,7 @@ public class FlfFulfillerController extends BaseController {
      * @author steelwei
      */
     @Log(title = "履约者-修改工作状态", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
     @PutMapping("/my/status")
     public R<Void> updateMyStatus(@RequestBody Map<String, String> params) {
         Long userId = LoginHelper.getUserId();
@@ -98,6 +101,7 @@ public class FlfFulfillerController extends BaseController {
      * @author steelwei
      */
     @Log(title = "履约者-修改工作城市", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
     @PutMapping("/my/city")
     public R<Void> updateMyCity(@RequestBody Map<String, String> params) {
         Long userId = LoginHelper.getUserId();
@@ -127,6 +131,7 @@ public class FlfFulfillerController extends BaseController {
      * 更新认证信息（App端）
      * @author steelwei
      */
+    @RepeatSubmit()
     @Log(title = "履约者-更新认证信息", businessType = BusinessType.UPDATE)
     @PostMapping("/my/auth")
     public R<Void> updateMyAuthInfo(@RequestBody Map<String, String> params) {
@@ -139,6 +144,7 @@ public class FlfFulfillerController extends BaseController {
      * @author steelwei
      */
     @Log(title = "履约者-修改手机号", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
     @PutMapping("/my/phone")
     public R<Void> updateMyPhone(@RequestBody Map<String, String> params) {
         Long userId = LoginHelper.getUserId();
@@ -151,6 +157,7 @@ public class FlfFulfillerController extends BaseController {
      * @author steelwei
      */
     @Log(title = "履约者-修改密码", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
     @PutMapping("/my/password")
     public R<Void> updateMyPassword(@RequestBody Map<String, String> params) {
         Long userId = LoginHelper.getUserId();
@@ -162,6 +169,7 @@ public class FlfFulfillerController extends BaseController {
      * @author steelwei
      */
     @Log(title = "履约者-注销账号", businessType = BusinessType.DELETE)
+    @RepeatSubmit()
     @DeleteMapping("/my/account")
     public R<Void> deleteMyAccount() {
         Long userId = LoginHelper.getUserId();
@@ -182,6 +190,7 @@ public class FlfFulfillerController extends BaseController {
      */
     //@SaCheckPermission("fulfiller:fulfiller:export")
     @Log(title = "履约者管理", businessType = BusinessType.EXPORT)
+    @RepeatSubmit()
     @PostMapping("/export")
     public void export(FlfFulfillerBo bo, HttpServletResponse response) {
         List<FlfFulfillerVo> list = fulfillerService.queryList(bo);
@@ -225,6 +234,7 @@ public class FlfFulfillerController extends BaseController {
      */
     //@SaCheckPermission("fulfiller:fulfiller:edit")
     @Log(title = "履约者管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
     @PutMapping("/changeStatus")
     public R<Void> changeStatus(@RequestParam Long id, @RequestParam String status) {
         return toAjax(fulfillerService.changeStatus(id, status));
@@ -235,6 +245,7 @@ public class FlfFulfillerController extends BaseController {
      */
     //@SaCheckPermission("fulfiller:fulfiller:edit")
     @Log(title = "履约者管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
     @PutMapping("/resetPwd")
     public R<Void> resetPwd(@RequestParam Long id, @RequestParam String password) {
         return toAjax(fulfillerService.resetPwd(id, password));

ruoyi-modules/yingpaipay-fulfiller/src/main/java/org/dromara/fulfiller/controller/FlfLevelConfigController.java

@@ -39,6 +39,7 @@ public class FlfLevelConfigController extends BaseController {
         return toAjax(flfLevelConfigService.updateByBo(bo));
     }
 
+    @RepeatSubmit()
     @DeleteMapping("/remove")
     public R<Void> remove(@RequestParam Long id) {
         return toAjax(flfLevelConfigService.deleteById(id));

ruoyi-modules/yingpaipay-fulfiller/src/main/java/org/dromara/fulfiller/controller/FlfLevelRigthtsController.java

@@ -41,6 +41,7 @@ public class FlfLevelRigthtsController extends BaseController {
         return toAjax(levelRightsService.updateByBo(bo));
     }
 
+    @RepeatSubmit()
     @DeleteMapping("/remove")
     public R<Void> remove(@RequestParam Long id) {
         return toAjax(levelRightsService.deleteById(id));

ruoyi-modules/yingpaipay-fulfiller/src/main/java/org/dromara/fulfiller/controller/FlfTagController.java

@@ -59,6 +59,7 @@ public class FlfTagController extends BaseController {
      */
     //@SaCheckPermission("fulfiller:tag:export")
     @Log(title = "标签管理", businessType = BusinessType.EXPORT)
+    @RepeatSubmit()
     @PostMapping("/export")
     public void export(FlfTagBo bo, HttpServletResponse response) {
         List<SysTagVo> list = tagService.queryList(bo);
@@ -102,6 +103,7 @@ public class FlfTagController extends BaseController {
      */
     //@SaCheckPermission("fulfiller:tag:remove")
     @Log(title = "标签管理", businessType = BusinessType.DELETE)
+    @RepeatSubmit()
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                            @PathVariable("ids") Long[] ids) {

ruoyi-modules/yingpaipay-fulfiller/src/main/java/org/dromara/fulfiller/service/impl/FlfAnamalyServiceImpl.java

@@ -197,7 +197,7 @@ public class FlfAnamalyServiceImpl implements IFlfAnamalyService {
             }
         });
 
-        if (fulfillerIds.isEmpty()) {
+        if (!fulfillerIds.isEmpty()) {
             flfFulfillerMapper.selectByIds(fulfillerIds)
                 .forEach(e -> fulfillerMap.put(e.getId(), e));
         }

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

@@ -56,6 +56,7 @@ public class SysSubOrderController extends BaseController {
         return subOrderService.listPendingAccept(bo, pageQuery);
     }
 
+    @RepeatSubmit()
     @PutMapping("/accept")
     public R<Void> accept(@RequestBody  SysSubOrderAcceptBo bo) {
         return toAjax(subOrderService.accept(bo));
@@ -66,6 +67,7 @@ public class SysSubOrderController extends BaseController {
         return R.ok(subOrderService.count());
     }
 
+    @RepeatSubmit()
     @PutMapping("/remark")
     public R<Void> remark(@RequestBody SysSubOrderRemarkBo bo) {
         return toAjax(subOrderService.remark(bo));
@@ -76,16 +78,19 @@ public class SysSubOrderController extends BaseController {
         return subOrderService.listOnMyOrder(bo, pageQuery);
     }
 
+    @RepeatSubmit()
     @PutMapping("/clockIn")
     public R<Void> clockIn(@RequestBody SysSubOrderClockInBo bo) {
         return toAjax(subOrderService.clockIn(bo));
     }
 
+    @RepeatSubmit()
     @PutMapping("/confirm")
     public R<Void> confirm(@RequestBody SysSubOrderConfirmBo bo) {
         return toAjax(subOrderService.confirm(bo));
     }
 
+    @RepeatSubmit()
     @PutMapping("/nursingSummary")
     public R<Void> nursingSummary(@RequestBody SysSubOrderNursingSummaryBo bo) {
         return toAjax(subOrderService.nursingSummary(bo));
@@ -96,6 +101,7 @@ public class SysSubOrderController extends BaseController {
         return R.ok(subOrderService.listOnDispatch(service, site));
     }
 
+    @RepeatSubmit()
     @PutMapping("/reject")
     public R<Void> reject(@RequestBody SysSubOrderRejectBo bo) {
         return toAjax(subOrderService.reject(bo));

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

@@ -4,6 +4,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.order.domain.excel.SysSubOrderLogExcel;
@@ -26,6 +27,7 @@ public class SysSubOrderLogController extends BaseController {
         return R.ok(subOrderLogService.list(orderId));
     }
 
+    @RepeatSubmit()
     @PostMapping("/export/{orderId}")
     public void export(@PathVariable Long orderId, HttpServletResponse response) {
         List<SysSubOrderLogExcel> list = subOrderLogService.listLogExcelList(orderId);

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

@@ -274,7 +274,7 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
 
         baseMapper.selectList(
             Wrappers.lambdaQuery(SysSubOrder.class)
-                .select(SysSubOrder::getId, SysSubOrder::getService, SysSubOrder::getPrice, SysSubOrder::getCreateTime, SysSubOrder::getStatus, SysSubOrder::getUsrPet)
+                .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();
@@ -283,6 +283,8 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
             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);
         });

ruoyi-modules/yingpaipay-service/src/main/java/org/dromara/service/controller/SysServiceController.java

@@ -98,6 +98,7 @@ public class SysServiceController extends BaseController {
      */
     //@SaCheckPermission("service:list:remove")
     @Log(title = "服务列表", businessType = BusinessType.DELETE)
+    @RepeatSubmit()
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable("ids") Long[] ids) {