Merge remote-tracking branch 'origin/test' into test

src/main/java/com/szwl/controller/IndexController.java

@@ -1573,10 +1573,15 @@ public class IndexController { ;
             TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipment.getId());
             equipmentDesc.setIsMaterialUse(isMaterialUse);
             equipmentDescService.updateById(equipmentDesc);
-//            return JsonMessage.success("success");
+            // 改变参数表里的状态
+            LambdaQueryWrapper<TParameters> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.eq(TParameters::getClientId,clientId);
+            queryWrapper.eq(TParameters::getName,"M502");
+            TParameters parameters = parametersService.getOne(queryWrapper);
+            parameters.setVal(isMaterialUse);
+            parametersService.updateById(parameters);
             return "success";
         }
-//        return JsonMessage.error("error");
         return "error";
     }
 

src/main/java/com/szwl/controller/RabbitMqController.java

@@ -46,11 +46,9 @@ public class RabbitMqController {
     @ResponseBody
     public String addExchange(String exchange,String type,Boolean durable){
         if(StringUtils.isEmpty(type)){
-//            return JsonMessage.success("type is null");
             return "type is null";
         }
         if(type.equals("Direct")){
-//            amqpAdmin.declareExchange(new DirectExchange(exchange, durable, false));
             amqpAdmin.declareExchange(new DirectExchange(exchange, durable, false));
 
         }

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -39,6 +39,7 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.Executors;
@@ -90,7 +91,7 @@ public class TEquipmentController {
     @PostMapping("/findList")
     public ResponseModel<IPage<?>> findList(Long id, String clientId, String adminName, String equipmentName,
                                             String areaName, String eqeStatus, String machineType, String equimentType,
-                                            String channel, String companyType, long current, long size) {
+                                            String channel, String companyType, String todayDate, long current, long size) {
 
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         TAdmin admin = tAdminService.getById(id);
@@ -175,7 +176,14 @@ public class TEquipmentController {
             return equipmentDTO;
         }).collect(Collectors.toList());
         for (TEquipmentDTO equipmentDTO : equipmentDTOList) {
-            Date date = new Date();//取时间
+//            Date date = new Date();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Date date = null;
+            try {
+                date  = sdf.parse(todayDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
             Calendar calendar = new GregorianCalendar();
             Calendar calendar_end = new GregorianCalendar();
             calendar.setTime(date);

src/main/java/com/szwl/controller/THuifuMchController.java

@@ -68,7 +68,6 @@ public class THuifuMchController {
         LambdaQueryWrapper<THuifuMchCheck> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(THuifuMchCheck::getAdminId,tHuifuMchCheck.getAdminId());
         THuifuMchCheck newHuifuMchCheck = tHuifuMchCheckService.getOne(queryWrapper);
-        newHuifuMchCheck.setModifyDate(new Date());
         if(newHuifuMchCheck.getStatus().equals("3")) {
             BeanUtil.copyProperties(tHuifuMchCheck,newHuifuMchCheck,ignoreProperties);
             newHuifuMchCheck.setStatus("1");
@@ -76,6 +75,8 @@ public class THuifuMchController {
             BeanUtil.copyProperties(tHuifuMchCheck,newHuifuMchCheck,ignoreProperties);
             newHuifuMchCheck.setStatus("4");
         }
+        newHuifuMchCheck.setCreateDate(new Date());
+        newHuifuMchCheck.setModifyDate(new Date());
         tHuifuMchCheckService.updateById(newHuifuMchCheck);
         return R.ok();
     }

src/main/java/com/szwl/controller/TOrderController.java

@@ -238,7 +238,7 @@ public class TOrderController {
                     }
                     return R.ok("申请退款成功");
                 }else {
-                    return R.fail("申请退款失败");
+                    return R.fail(refundData);
                 }
             } catch (Exception e) {
                 e.printStackTrace();

src/main/java/com/szwl/service/impl/THuifuMchServiceImpl.java

@@ -177,6 +177,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
             tHuifuMch.setCreateDate(new Date());
             tHuifuMch.setModifyDate(new Date());
             tHuifuMch.setHuifuId(huifuId);
+            tHuifuMchCheck.setModifyDate(new Date());
             tHuifuMchCheck.setStatus("2");
             tHuifuMchCheck.setHuifuId(huifuId);
             tHuifuMchService.save(tHuifuMch);
@@ -184,6 +185,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
             return "success";
         }else {
             String respDesc = dataObject.getString("resp_desc");
+            tHuifuMchCheck.setModifyDate(new Date());
             tHuifuMchCheck.setStatus("3");
             tHuifuMchCheck.setAuditDesc(respDesc);
             tHuifuMchCheckService.updateById(tHuifuMchCheck);
@@ -365,6 +367,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
             tHuifuMch.setCreateDate(new Date());
             tHuifuMch.setModifyDate(new Date());
             tHuifuMch.setHuifuId(huifuId);
+            tHuifuMchCheck.setModifyDate(new Date());
             tHuifuMchCheck.setStatus("2");
             tHuifuMchCheck.setHuifuId(huifuId);
             tHuifuMchService.save(tHuifuMch);
@@ -372,6 +375,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
             return "success";
         }else {
             String respDesc = dataObject.getString("resp_desc");
+            tHuifuMchCheck.setModifyDate(new Date());
             tHuifuMchCheck.setStatus("3");
             tHuifuMchCheck.setAuditDesc(respDesc);
             tHuifuMchCheckService.updateById(tHuifuMchCheck);
@@ -485,6 +489,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
             tHuifuMch.setModifyDate(new Date());
             huifuMchCheck.setStatus("2");
             huifuMchCheck.setSms(null);
+            huifuMchCheck.setModifyDate(new Date());
             tHuifuMchService.updateById(tHuifuMch);
             tHuifuMchCheckService.updateById(huifuMchCheck);
             return "success";
@@ -493,6 +498,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
             huifuMchCheck.setStatus("3");
             huifuMchCheck.setSms(null);
             huifuMchCheck.setAuditDesc(respDesc);
+            huifuMchCheck.setModifyDate(new Date());
             tHuifuMchCheckService.updateById(huifuMchCheck);
             return respDesc;
         }