ソースを参照

二手订单,确认打款供应商

chao 3 年 前
コミット
133cd6b811

+ 21 - 0
src/main/java/com/caimei365/order/controller/OrderClubApi.java

@@ -255,4 +255,25 @@ public class OrderClubApi {
         }
         return orderClubService.getOrderShareInitProduct(orderId);
     }
+
+    /**
+     * 二手订单 确认打款供应商
+     *
+     * @param orderDto {
+     *                orderId      订单ID
+     *                userId       用户Id
+     * }
+     */
+    @ApiOperation("二手订单,确认打款供应商(旧:/order/affirm/payment)")
+    @PostMapping("/second/payment/confirm")
+    public ResponseJson<Void> secondPaymentConfirm(OrderDto orderDto){
+        if (null == orderDto.getUserId()) {
+            return ResponseJson.error("用户Id不能为空!", null);
+        }
+        if (null == orderDto.getOrderId()) {
+            return ResponseJson.error("订单Id不能为空!", null);
+        }
+        return orderClubService.secondPaymentConfirm(orderDto.getOrderId(), orderDto.getUserId());
+    }
+
 }

+ 5 - 0
src/main/java/com/caimei365/order/model/dto/OrderDto.java

@@ -17,6 +17,11 @@ public class OrderDto {
      */
     @ApiModelProperty("订单Id")
     private Integer orderId;
+    /**
+     * 用户Id
+     */
+    @ApiModelProperty("用户Id")
+    private Integer userId;
     /**
      * 备注(订单取消原因)
      */

+ 6 - 0
src/main/java/com/caimei365/order/service/OrderClubService.java

@@ -103,4 +103,10 @@ public interface OrderClubService {
      * @param orderId 订单Id
      */
     ResponseJson<List<OrderProductVo>> getOrderShareInitProduct(Integer orderId);
+    /**
+     * 二手订单 确认打款供应商
+     * @param orderId 订单Id
+     * @param userId 用户Id
+     */
+    ResponseJson<Void> secondPaymentConfirm(Integer orderId, Integer userId);
 }

+ 36 - 0
src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -804,4 +804,40 @@ public class OrderClubServiceImpl implements OrderClubService {
         return ResponseJson.success(orderProductList);
     }
 
+    /**
+     * 二手订单 确认打款供应商
+     *
+     * @param orderId 订单Id
+     * @param userId  用户Id
+     */
+    @Override
+    public ResponseJson<Void> secondPaymentConfirm(Integer orderId, Integer userId) {
+        OrderPo orderPo = orderClubMapper.getMainOrderByOrderId(orderId);
+        if (null == orderPo) {
+            return ResponseJson.error("该订单不存在!", null);
+        }
+        if (!userId.equals(orderPo.getUserId())) {
+            return ResponseJson.error("需机构自身确认打款供应商!", null);
+        }
+        boolean flag = 1 == orderPo.getSecondHandOrderFlag() && 0 == orderPo.getRefundType() && 0 == orderPo.getAffirmPaymentFlag();
+        if (flag) {
+            if (orderPo.getStatus().toString().startsWith("3") && 3 == orderPo.getPayStatus()) {
+                orderPo.setAffirmPaymentFlag(1);
+                orderPo.setStatus(5);
+            } else if (orderPo.getStatus().toString().startsWith("3")) {
+                orderPo.setAffirmPaymentFlag(1);
+                orderPo.setStatus(4);
+            } else if (orderPo.getStatus().toString().startsWith("2")) {
+                orderPo.setAffirmPaymentFlag(1);
+            } else {
+                return ResponseJson.error("订单状态异常!", null);
+            }
+            // 更新订单状态
+            orderClubMapper.updateOrderStatus(orderPo);
+        } else {
+            return ResponseJson.error("订单状态异常!", null);
+        }
+        return ResponseJson.success(null);
+    }
+
 }

+ 3 - 0
src/main/resources/mapper/OrderClubMapper.xml

@@ -28,6 +28,9 @@
         <if test="confirmTime != null and confirmTime != ''">
             ,confirmTime = #{confirmTime}
         </if>
+        <if test="affirmPaymentFlag != null and affirmPaymentFlag != ''">
+            ,affirmPaymentFlag = #{affirmPaymentFlag}
+        </if>
         ,updateDate = #{updateDate}
         WHERE orderID = #{orderId}
     </update>