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

yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersSaveReqVO.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.haoka.controller.admin.orders.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 订单新增/修改 Request VO")
@@ -258,5 +259,15 @@ public class OrdersSaveReqVO {
      */
     @Schema(description = "销售归属名称")
     private String salesAttributionName;
+    /*
+     * 订单金额
+     */
+    @Schema(description = "订单金额")
+    private BigDecimal orderAmount;
+    /**
+     * 支付金额
+     */
+    @Schema(description = "支付金额")
+    private BigDecimal payAmount;
 
 }

yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java

@@ -149,6 +149,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
         orders.setRefundStatus(ObjectUtil.isEmpty(orders.getRefundStatus()) ? "800" : orders.getRefundStatus());
         // 未激活
         orders.setActiveStatus(ObjectUtil.isEmpty(orders.getActiveStatus())? "0" : orders.getActiveStatus());
+        log.error("系统入库订单数据：{}", JSON.toJSONString(orders));
         ordersMapper.insert(orders);
 
 
@@ -172,6 +173,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
 //                asyncSubmitAuditOrders(ordersDO);
 //            }
 //        });
+        log.error("判断自动提交审核前订单数据：{}", JSON.toJSONString(ordersDO));
         ordersService.asyncSubmitAuditOrders(ordersDO);
         // 返回
         return orders.getId();
@@ -316,7 +318,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
                 updateObj.setReason(oldOrderDo.getReason() + "\n"+ "提交初审:该订单身份证号码或手机号在系统黑名单中");
                 canAudit = false;
             }
+            log.error("提交审核的订单数据：{}", JSON.toJSONString(updateObj));
         }
+        log.error("更新订单前的数据：{}", JSON.toJSONString(updateObj));
         ordersService.updateOrderById(updateObj);
         // 异步处理 审核成功是否自动进单
         Integer autoType = oldOrderDo.getAutoType();
@@ -468,14 +472,35 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
                 log.error("【审核订单自动生产】,操作日志数据：{}",JSON.toJSONString(logSaveReqVO));
                 orderOperateLogService.createOrderOperateLog(logSaveReqVO);
                 log.error("【审核订单自动提交上游】,订单数据：{}",JSON.toJSONString(updateObj));
-                createOrderToOperators(updateObj);
+                try {
+                    createOrderToOperators(updateObj);
+                } catch (Exception e) {
+                    log.error("【审核订单自动提交上游异常】,订单数据：{},异常信息{},异常栈信息{}",JSON.toJSONString(updateObj),e.getMessage(),e);
+                    updateObj.setStatus(-460L); // 开卡失败
+                    updateObj.setReason(ordersOld.getReason() + "\n"+ "自动提交上游异常:"+e.getMessage());
+                    log.error("【审核订单手动生产】,订单数据：{}",JSON.toJSONString(updateObj));
+                    OrderOperateLogSaveReqVO logSaveReqVO1 = new OrderOperateLogSaveReqVO();
+                    logSaveReqVO1.setOrderId(updateObj.getId());
+                    logSaveReqVO1.setMsg("自动提交上游异常:"+e.getMessage());
+                    logSaveReqVO1.setMsgType("1");
+                    logSaveReqVO1.setMsgSource("0");
+                    log.error("【审核订单手动生产】,操作日志数据：{}",JSON.toJSONString(logSaveReqVO1));
+                    orderOperateLogService.createOrderOperateLog(logSaveReqVO1);
+                }
             } else {
 //                手动生产
-                log.error("【审核订单手动】,订单数据：{}",JSON.toJSONString(updateObj));
+                log.error("【审核订单手动生产】,订单数据：{}",JSON.toJSONString(updateObj));
                 updateObj.setStatus(450L);
-                ordersService.updateOrderById(updateObj);
+                OrderOperateLogSaveReqVO logSaveReqVO = new OrderOperateLogSaveReqVO();
+                logSaveReqVO.setOrderId(updateObj.getId());
+                logSaveReqVO.setMsg("进入手动生产订单流程");
+                logSaveReqVO.setMsgType("0");
+                logSaveReqVO.setMsgSource("0");
+                log.error("【审核订单手动生产】,操作日志数据：{}",JSON.toJSONString(logSaveReqVO));
+                orderOperateLogService.createOrderOperateLog(logSaveReqVO);
             }
-
+            log.error("【审核订单完成】,订单数据：{}",JSON.toJSONString(updateObj));
+            ordersService.updateOrderById(updateObj);
         }
         // 如果是抖音订单  则需要调用抖音接口 返回审核结果
         String source = ordersOld.getSource();