订单审核 审核人不正确修改

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderAuditScrmController.java

@@ -5,6 +5,7 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.entity.SysUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.utils.SecurityUtils;
+import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.CompanyUser;
 import com.fs.hisStore.param.FsStoreOrderAuditParam;
 import com.fs.hisStore.param.FsStoreOrderAuditReviewParam;

fs-company/src/main/java/com/fs/hisStore/controller/FsStoreOrderAuditScrmController.java

@@ -46,7 +46,7 @@ public class FsStoreOrderAuditScrmController extends BaseController {
     @GetMapping("/auditBatch")
     public AjaxResult auditBatch(@RequestParam("ids") String ids) {
         CompanyUser user = SecurityUtils.getLoginUser().getUser();
-        fsStoreOrderAuditService.auditBatch(ids, user.getUserId(), true);
+        fsStoreOrderAuditService.auditBatch(ids, user.getUserId(), false);
         return AjaxResult.success();
     }
 
@@ -60,7 +60,7 @@ public class FsStoreOrderAuditScrmController extends BaseController {
     @PreAuthorize("@ss.hasAnyPermi('store:storeOrderAudit:auditAgain')")
     @PostMapping("/auditAgain")
     public AjaxResult auditAgain(@Valid @RequestBody FsStoreOrderAuditPayRemainParam param) {
-        fsStoreOrderAuditService.auditAgain(param, true);
+        fsStoreOrderAuditService.auditAgain(param, false);
         return AjaxResult.success();
     }
 

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderAuditScrmServiceImpl.java

@@ -30,13 +30,21 @@ public class FsStoreOrderAuditScrmServiceImpl extends ServiceImpl<FsStoreOrderAu
     private final IFsStoreOrderAuditLogScrmService fsStoreOrderAuditLogService;
 
     /**
-     * 查询订单审核列表
+     * 查询订单审核列表 倍力优审核只需一次审核，做出修改
      * @param param 参数
      * @return  list
      */
     @Override
     public List<FsStoreOrderAuditVO> selectStoreOrderAuditVOList(FsStoreOrderAuditParam param) {
-        return baseMapper.selectStoreOrderAuditVOList(param);
+        List<FsStoreOrderAuditVO> list=baseMapper.selectStoreOrderAuditVOList(param);
+        list.forEach(item -> {
+            if(StringUtils.isNotEmpty(item.getCompanyAuditUserName())){
+                item.setCompanyAuditUserName("销售端:"+item.getCompanyAuditUserName());
+            }else if(StringUtils.isNotEmpty(item.getAdminAuditUserName())){
+                item.setCompanyAuditUserName("总后台:"+item.getAdminAuditUserName());
+            }
+        });
+        return list;
     }
 
     /**
@@ -137,7 +145,11 @@ public class FsStoreOrderAuditScrmServiceImpl extends ServiceImpl<FsStoreOrderAu
 
         fsStoreOrderAudit.setCompanyAuditTime(now);
         fsStoreOrderAudit.setAuditStatus(newStatus.getValue());
-        fsStoreOrderAudit.setCompanyAuditUserId(userId);
+        if(isAdmin){
+            fsStoreOrderAudit.setAdminAuditUserId(userId);
+        }else {
+            fsStoreOrderAudit.setCompanyAuditUserId(userId);
+        }
         baseMapper.updateById(fsStoreOrderAudit);
         FsStoreOrderAuditLogScrm auditLog = new FsStoreOrderAuditLogScrm();
         auditLog.setAuditId(fsStoreOrderAudit.getId());
@@ -168,7 +180,11 @@ public class FsStoreOrderAuditScrmServiceImpl extends ServiceImpl<FsStoreOrderAu
         FsStoreOrderAuditScrm update = new FsStoreOrderAuditScrm();
         update.setAuditStatus(OrderAuditStateEnum.APPROVED.getValue());
         update.setCompanyAuditTime(LocalDateTime.now());
-        update.setCompanyAuditUserId(userId);
+        if(b){
+            update.setAdminAuditUserId(userId);
+        }else {
+            update.setCompanyAuditUserId(userId);
+        }
         List<Long> idLists = list.stream().map(FsStoreOrderAuditScrm::getId).collect(Collectors.toList());
         baseMapper.updateBatchAudit(update,idLists);
 

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderAuditVO.java

@@ -95,4 +95,7 @@ public class FsStoreOrderAuditVO {
     /* 订单创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime orderCreateTime;
+
+    /* 备注 */
+    private String mark;
 }

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderAuditScrmMapper.xml

@@ -4,6 +4,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fs.hisStore.mapper.FsStoreOrderAuditScrmMapper">
 
+
+    <!-- 倍力优版本 只需审核一次   -->
     <select id="selectStoreOrderAuditVOList" resultType="com.fs.hisStore.vo.FsStoreOrderAuditVO">
         select
             fsoa.id,
@@ -25,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             fso.pay_price,
             fso.order_type,
             fso.create_time orderCreateTime,
+            fso.mark,
             c.company_name,
             cu.nick_name companyUserName,
             cau.nick_name companyAuditUserName,