Merge branch 'v5.7_break_contract_reverse_20231020' into test

performance-web/src/main/java/com/clx/performance/controller/payment/PayNotifyController.java

@@ -29,18 +29,19 @@ public class PayNotifyController {
 
     @ApiOperation(value = "用户支付完成回调接口", notes = " <br>By:许建科")
     @RequestMapping(value = "/userPayNotify", method = RequestMethod.POST)
-    public Result<Object> userPayNotify(@RequestBody NotifyParam notify) {
+    public Result<Object> userPayNotify(@RequestBody String notify) {
+   // public Result<Object> userPayNotify(@RequestBody NotifyParam notify) {
         log.info("用户支付完成回调接口 传参 {}", notify);
-        if (Objects.isNull(notify) || Objects.isNull(notify.getCode()) || Objects.isNull(notify.getAction())) {
-            return new Result<>();
-        }
-        if (notify.getCode() != 0) {
-            // 支付失败处理
-            log.info("唯一id {}", notify.getOrderNo());
-        } else {
-            // 支付支付成功处理
-            log.info("唯一id {}", notify.getOrderNo());
-        }
+//        if (Objects.isNull(notify) || Objects.isNull(notify.getCode()) || Objects.isNull(notify.getAction())) {
+//            return new Result<>();
+//        }
+//        if (notify.getCode() != 0) {
+//            // 支付失败处理
+//            log.info("唯一id {}", notify.getOrderNo());
+//        } else {
+//            // 支付支付成功处理
+//            log.info("唯一id {}", notify.getOrderNo());
+//        }
         Result<Object> ret = new Result<>();
         return ret;
     }

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -2,6 +2,7 @@ package com.clx.performance.controller.pc;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.feign.OrderFeign;
+import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.pc.OrderGoodsCancelParam;
 import com.clx.performance.param.pc.UpdateEditOrderGoodsParam;
 import com.clx.performance.param.pc.OrderGoodsParams;
@@ -13,6 +14,7 @@ import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.param.pc.UpdateOrderGoodsPriceParam;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
+import com.clx.performance.service.OrderGoodsTruckBindService;
 import com.clx.performance.vo.pc.OrderChildPCVO;
 import com.clx.performance.vo.pc.OrderGoodsEditVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
@@ -20,6 +22,7 @@ import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
+import com.msl.common.utils.DateUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -69,6 +72,9 @@ public class GoodsOrderController {
     @Autowired
     private GoodsOrderStrategyContext goodsOrderStrategyContext;
 
+    @Autowired
+    private OrderGoodsTruckBindService orderGoodsTruckBindService;
+
     @ApiOperation(value = "提交货单", notes = "<br>By:胡宇帆")
     @PostMapping("/saveGoodsOrder")
     @UnitCovert(result = false)
@@ -190,4 +196,15 @@ public class GoodsOrderController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "司机端无接单位置上报", notes = "<br>By:胡宇帆")
+    @GetMapping("/getCancelOrderGoods")
+    public Result<List<OrderGoods>> getCancelOrderGoods(@RequestParam(value = "truckNo") String truckNo) {
+        LocalDateTime now = LocalDateTime.now();
+        return Result.ok(orderGoodsTruckBindService.getCancelOrderGoods(truckNo,
+                DateUtils.formatDateTime(now.plusDays(-3), "yyyy-MM-dd HH:mm:ss").get(),
+                DateUtils.formatDateTime(now, "yyyy-MM-dd HH:mm:ss").get()
+                )
+        );
+    }
+
 }