Merge branch 'xggsve-order-dev' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-order-dev

xggsve-order/app/base/api/impl/op/action.js

@@ -46,6 +46,7 @@ class ActionAPI extends APIBase {
             case "completedOrder": //完善信息接口
             case "completedOrder": //完善信息接口
                 opResult = await this.iborderbaseSve.apiCompletedOrder(action_body);
                 opResult = await this.iborderbaseSve.apiCompletedOrder(action_body);
                 break;
                 break;
+
             case "handling":       //订单办理接口
             case "handling":       //订单办理接口
                 opResult = await this.iborderbaseSve.apiHandling(action_body);
                 opResult = await this.iborderbaseSve.apiHandling(action_body);
                 break;
                 break;

xggsve-order/app/base/service/impl/order/iborderbaseSve.js

@@ -41,6 +41,11 @@ class IborderbaseService extends ServiceBase {
     }
     }
 
 
     try {
     try {
+      let exists = await this.service.findOne({thirdNo: params.thirdNo});
+      if(exists) {
+        return system.getResult(null, `订单号【${params.thirdNo}】已存在`);
+      }
+
       let channel =await this.channelSve.findOne({channelNo: params.channelNo});
       let channel =await this.channelSve.findOne({channelNo: params.channelNo});
       if (!channel) {
       if (!channel) {
         return system.getResult(null, `渠道${params.channelNo}不存在`);
         return system.getResult(null, `渠道${params.channelNo}不存在`);
@@ -76,7 +81,7 @@ class IborderbaseService extends ServiceBase {
             payType: params.payType,
             payType: params.payType,
             payStatus: "10",
             payStatus: "10",
           };
           };
-          payment = await this.paymentSve.create(payment);
+          payment = await this.paymentSve.create(payment, t);
           params.orderpay_id = payment.id;
           params.orderpay_id = payment.id;
         }
         }
         // 将id赋值
         // 将id赋值

xggsve-order/app/base/service/sve.base.js

@@ -153,8 +153,8 @@ class ServiceBase {
   async delete(qobj) {
   async delete(qobj) {
     return this.dao.delete(qobj);
     return this.dao.delete(qobj);
   }
   }
-  async create(qobj) {
-    return this.dao.create(qobj);
+  async create(qobj, t) {
+    return this.dao.create(qobj, t);
   }
   }
   async update(qobj, tm = null) {
   async update(qobj, tm = null) {
     return this.dao.update(qobj, tm);
     return this.dao.update(qobj, tm);