需求

mall-server-api/src/main/java/com/gree/mall/manager/controller/settle/WorkerSettleExpenseController.java

@@ -88,6 +88,8 @@ public class WorkerSettleExpenseController {
     @ApiOperation("费用结算导入(下载模板:师傅费用结算导入模板.xlsx)")
     public ResponseHelper importData(
             @ApiParam(value = "附件", required = true) @RequestPart("file") MultipartFile file,
+            @RequestParam String createWebsitId,
+            @RequestParam String createWebsitName,
             HttpServletRequest request
     ) throws Exception {
         AdminUserCom adminUser = commonLogic.getAdminUser();
@@ -98,7 +100,7 @@ public class WorkerSettleExpenseController {
         }
         try {
             InputStream inputStream = file.getInputStream();
-            workerSettleExpenseLogic.importData(adminUser, inputStream, request);
+            workerSettleExpenseLogic.importData(adminUser, inputStream, request,createWebsitId,createWebsitName);
         } finally {
             obtain.unlock();
         }

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseController.java

@@ -153,13 +153,13 @@ public class OrderBaseController {
 
     @PostMapping("/reject")
     @ApiOperation(value = "驳回工单")
-    public ResponseHelper reject(@RequestParam String orderBaseId) throws InterruptedException {
+    public ResponseHelper reject(@RequestParam String orderBaseId,@RequestParam String createWebsitId,@RequestParam String createWebsitName) throws InterruptedException {
         Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + orderBaseId);
         if(!obtain.tryLock(10,TimeUnit.SECONDS)){
             throw new RemoteServiceException("系统繁忙,请稍后再试");
         }
         try{
-            orderBaseLogic.reject(orderBaseId);
+            orderBaseLogic.reject(orderBaseId,createWebsitId,createWebsitName);
         }finally {
             obtain.unlock();
         }
@@ -336,10 +336,12 @@ public class OrderBaseController {
     @PostMapping("/import")
     @ApiOperation(value = "导入工单，模板名：工单导入模板.xlsx")
     public ResponseHelper importData(
-            @RequestParam MultipartFile file
+            @RequestParam MultipartFile file,
+            @RequestParam String createWebsitId,
+            @RequestParam String createWebsitName
     ) throws IOException {
         List<Object> objects = ExcelUtils.importExcel(file);
-        orderBaseExcelLogic.importOrder(objects);
+        orderBaseExcelLogic.importOrder(objects,createWebsitId,createWebsitName);
         return ResponseHelper.success();
     }
 
@@ -347,10 +349,12 @@ public class OrderBaseController {
     @PostMapping("/import2")
     @ApiOperation(value = "导入工单，模板名：工单导入模板2.xlsx")
     public ResponseHelper importData2(
-            @RequestParam MultipartFile file
+            @RequestParam MultipartFile file,
+                     @RequestParam String createWebsitId,
+            @RequestParam String createWebsitName
     ) throws IOException {
         List<Object> objects = ExcelUtils.importExcel(file);
-        orderBaseExcelLogic.importOrder2(objects);
+        orderBaseExcelLogic.importOrder2(objects,createWebsitId,createWebsitName);
         return ResponseHelper.success();
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/settle/WorkerSettleExpenseLogic.java

@@ -85,7 +85,7 @@ public class WorkerSettleExpenseLogic {
 
     }
 
-    public void importData(AdminUserCom adminUser, InputStream inputStream, HttpServletRequest request) throws Exception {
+    public void importData(AdminUserCom adminUser, InputStream inputStream, HttpServletRequest request,String createWebsitId, String createWebsitName) throws Exception {
 
         //读取excel数据
         ExcelReader reader = ExcelUtil.getReader(inputStream);
@@ -137,8 +137,8 @@ public class WorkerSettleExpenseLogic {
             final ImportSettleExpenseItem item = itemList.get(i);
             item.setCompanyWechatId(companyWechatId)
                     .setCompanyWechatName(companyWechatName)
-                    .setWebsitId(adminUser.getAdminWebsit().getWebsitId())
-                    .setWebsitName(adminUser.getAdminWebsit().getName())
+                   .setWebsitId(createWebsitId)
+                    .setWebsitName(createWebsitName)
                     .setTypeName(StrUtil.trim(item.getTypeName()))
                     .setCategory(StrUtil.trim(item.getCategory()));
 
@@ -222,8 +222,8 @@ public class WorkerSettleExpenseLogic {
         SettleExpense expense = new SettleExpense();
         expense.setCompanyWechatId(companyWechatId);
         expense.setCompanyWechatName(companyWechatName);
-        expense.setWebsitId(adminUser.getAdminWebsit().getWebsitId());
-        expense.setWebsitName(adminUser.getAdminWebsit().getName());
+        expense.setWebsitId(createWebsitId);
+        expense.setWebsitName(createWebsitName);
         expense.setImportBatchNo(IdWorker.getIdStr());
         expense.setSettleByCount(byCount.size());
         expense.setSettleOrderCount(itemList.size());
@@ -518,9 +518,9 @@ public class WorkerSettleExpenseLogic {
         String companyWechatName = adminUser.getAdminCompanyWechat().getCompanyName();
 
         item.setCompanyWechatId(companyWechatId)
-                .setCompanyWechatName(companyWechatName)
-                .setWebsitId(adminUser.getAdminWebsit().getWebsitId())
-                .setWebsitName(adminUser.getAdminWebsit().getName());
+                .setCompanyWechatName(companyWechatName);
+               // .setWebsitId(adminUser.getAdminWebsit().getWebsitId())
+              //  .setWebsitName(adminUser.getAdminWebsit().getName());
 
         Map<String, User> userMap = this.getUserMap(companyWechatId);
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseExcelLogic.java

@@ -29,6 +29,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -70,7 +71,7 @@ public class OrderBaseExcelLogic {
      * @param rows
      */
     @Transactional
-    public void importOrder(List<Object> rows){
+    public void importOrder(List<Object> rows,String createWebsitId, String createWebsitName){
         AdminUserCom adminUser = commonLogic.getAdminUser();
         //品牌map
         Map<String, Brand> brandMap = sysDictCompanyLogic.brandMapOfName(adminUser.getCompanyWechatId());
@@ -320,8 +321,8 @@ public class OrderBaseExcelLogic {
             pgOrderBase.setSource(source);
             pgOrderBase.setOrderChannelId(orderChannelDict.getDictCode());
             pgOrderBase.setOrderChannelText(orderChannelDict.getDictValue());
-            pgOrderBase.setCreateWebsitId(adminUser.getAdminWebsit().getWebsitId());
-            pgOrderBase.setCreateWebsitName(adminUser.getAdminWebsit().getName());
+            pgOrderBase.setCreateWebsitId(createWebsitId);
+            pgOrderBase.setCreateWebsitName(createWebsitName);
             if(importBaseStatusEnum != null){
                 pgOrderBase.setOrderStatus(importBaseStatusEnum.getKey());
                 pgOrderBase.setOrderStatusText(importBaseStatusEnum.getRemark());
@@ -432,7 +433,7 @@ public class OrderBaseExcelLogic {
      * 导入工单2
      * @param rows
      */
-    public void importOrder2(List<Object> rows){
+    public void importOrder2(List<Object> rows,String createWebsitId, String createWebsitName){
         AdminUserCom adminUser = commonLogic.getAdminUser();
         //品牌map
         Map<String, Brand> brandMap = sysDictCompanyLogic.brandMapOfName(adminUser.getCompanyWechatId());
@@ -661,8 +662,8 @@ public class OrderBaseExcelLogic {
             pgOrderBase.setSource("导入");
             pgOrderBase.setOrderChannelId(orderChannelDict.getDictCode());
             pgOrderBase.setOrderChannelText(orderChannelDict.getDictValue());
-            pgOrderBase.setCreateWebsitId(adminUser.getAdminWebsit().getWebsitId());
-            pgOrderBase.setCreateWebsitName(adminUser.getAdminWebsit().getName());
+            pgOrderBase.setCreateWebsitId(createWebsitId);
+            pgOrderBase.setCreateWebsitName(createWebsitName);
             if(importBaseStatusEnum != null){
                 pgOrderBase.setOrderStatus(importBaseStatusEnum.getKey());
                 pgOrderBase.setOrderStatusText(importBaseStatusEnum.getRemark());

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -216,8 +216,8 @@ public class OrderBaseLogic {
         PgOrderBase orderBase = this.conver(old,orderAddBeanDTO,addFlag);
         orderBase.setCompanyWechatId(adminUser.getCompanyWechatId());
         orderBase.setCompanyWechatName(adminUser.getCompanyName());
-        orderBase.setCreateWebsitId(adminUser.getAdminWebsit().getWebsitId());
-        orderBase.setCreateWebsitName(adminUser.getAdminWebsit().getName());
+       // orderBase.setCreateWebsitId(adminUser.getAdminWebsit().getWebsitId());
+       // orderBase.setCreateWebsitName(adminUser.getAdminWebsit().getName());
         orderBase.setCreateMobile(adminUser.getLinkPhone());
         orderBase.setIsQd(orderAddBeanDTO.getIsQd());
         orderBase.setIsQdNotice(true);
@@ -872,7 +872,7 @@ public class OrderBaseLogic {
      * @param orderBaseId
      */
     @Transactional
-    public void reject(String orderBaseId){
+    public void reject(String orderBaseId,String createWebsitId ,String createWebsitName){
         AdminUserCom adminUser = commonLogic.getAdminUser();
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
         if(pgOrderBase == null){
@@ -884,7 +884,7 @@ public class OrderBaseLogic {
         pgOrderBase.setOrderStatus(OrderBaseStatusEnum.FWZ.getKey());
         pgOrderBase.setOrderStatusText(OrderBaseStatusEnum.FWZ.getRemark());
         pgOrderBase.updateById();
-        orderLogLogic.addLog(orderBaseId,"未完工驳回",adminUser.getNickName()+"于"+DateUtil.formatDateTime(new Date())+"驳回工单到服务中",adminUser.getAdminWebsit().getName());
+        orderLogLogic.addLog(orderBaseId,"未完工驳回",adminUser.getNickName()+"于"+DateUtil.formatDateTime(new Date())+"驳回工单到服务中",createWebsitName);
         //删除标记
         orderFlagLogic.deleteOrderFlag(orderBaseId,OrderFlagEnum.YWG);
         //删除产生的结算数据

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderLogLogic.java

@@ -303,7 +303,7 @@ public class OrderLogLogic {
         pgOrderOperatorLog.setType(type);
         pgOrderOperatorLog.setOrderBaseId(orderBaseId);
         if(adminUser != null && adminUser.getAdminWebsit() != null) {
-            websitName = adminUser.getAdminWebsit().getName();
+            websitName = websitName;
         }
         pgOrderOperatorLog.setCreateWebsit(websitName);
         pgOrderOperatorLog.setImgSrc(imgSrc);