gsb

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

@@ -171,88 +171,31 @@ class IborderService extends ServiceBase {
   // -----------------------以此间隔，上面为API下面为service---------------------------------
 
   async createOrder(params, t) {
-
     // 产品项
-    params.productItems = (params.productItems || []).join("");
-
     var order = {};
-    order.price = Number(params.price || 0);
-    order.status = "1000";
-
-    var merchantId = params.merchantId || params.merchant_id;
-    if (merchantId) {
-      var exists = await this.dao.findOne({
-        merchant_id: this.trim(merchantId),
-        channelOrderNo: this.trim(params.channelOrderNo),
-      });
-      if (exists) {
-        return system.getResult(null, "订单号【" + params.channelOrderNo + "】重复");
-      }
-      var merchantData = await this.microsveClient.call("merchant", "getById", {
-        "id": merchantId
-      });
-      if (merchantData.status != 0) {
-        return merchantData;
-      }
-
-      var merchant = merchantData.data;
-      if (!merchant.mustPay) {
-        order.price = 0;
-        order.status = "1020";
-      }
+    // 赋值
+    for (var k in params) {
+      order[k] = params[k];
     }
+    order.productItems = (order.productItems || []).join(",");
+    order.status = "1010";
 
     var busiStatus = await this.orderBusinessStatus.findOrderBusinessStatus(order.status);
     if (busiStatus) {
       order.ostatus = busiStatus.ostatus;
     }
 
-    // 商户id
-    order.merchant_id = this.trim(merchantId);
-
     // 三方渠道号
     order.channelOrderNo = this.trim(params.channelOrderNo);
 
     // 订单资料信息
     order.legalName = this.trim(params.legalName);
     order.legalMobile = this.trim(params.legalMobile);
-    order.legalImg = this.trim(params.legalImg);
-    order.idcard = this.trim(params.idcard);
-    order.idcardFront = this.trim(params.idcardFront);
-    order.idcardBack = this.trim(params.idcardBack);
-    order.bankNo = this.trim(params.bankNo);
-    order.bank = this.trim(params.bank);
-    order.bankImg = this.trim(params.bankImg);
-    order.names = this.trim(params.names);
-    order.capital = this.trim(params.capital);
-
-    order.domicile_id = this.trim(params.domicileId);
-    order.domicileName = this.trim(params.domicileName);
-
-    // 个体户经营范围
-    order.businessScope_id = this.trim(params.businessScopeId);
-    order.businessType = this.trim(params.businessType);
-    order.businessScope = this.trim(params.businessScope);
-    order.bdId = this.trim(params.bdId);
-    order.bdPath = this.trim(params.bdId);
-
-    // 邮寄地址
-    order.mailAddr = this.trim(params.mailAddr);
-    order.mailTo = this.trim(params.mailTo);
-    order.mailMobile = this.trim(params.mailMobile);
-
-    order.userId = this.trim(params.userId);
 
-    // var baseOrder = {};
-    // baseOrder = await this.baseorderDao.create(baseOrder);
-    // order.id = baseOrder.id;
-
-    order = await this.dao.create(order);
+    order = await this.dao.create(order, t);
     return system.getResultSuccess({
       orderNo: order.id
     });
-
-
   }
 
   async statTransData(params) {

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

@@ -40,9 +40,9 @@ class IborderbaseService extends ServiceBase {
     // if(!params.channelNo){
     //   return system.getResult(null, `参数错误 渠道名称错误`);
     // }
-    // if(!params.thirdNo){
-    //   return system.getResult(null, `参数错误 订单错误`);
-    // }
+    if(!params.thirdNo){
+      return system.getResult(null, `请传入订单id`);
+    }
     // if(!Number(params.price)<0){
     //   return system.getResult(null, `参数错误 订单价格错误`);
     // }
@@ -66,6 +66,11 @@ class IborderbaseService extends ServiceBase {
     }
 
     try {
+      let channel = this.channelSve.findOne({channelNo: params.channelNo});
+      if (!channel) {
+        return system.getResult(null, `渠道${params.channelNo}不存在`);
+      }
+
       params.channelNo = this.trim(params.channelNo);
       params.thirdNo = this.trim(params.thirdNo);
       params.notes = this.trim(params.notes);
@@ -76,22 +81,32 @@ class IborderbaseService extends ServiceBase {
       params.productType = productType;
       params.price = Number(params.price || 0);
       params.status = "1000"; // 待处理
+      params.channelOrderNo = params.channelNo;
+
       let self = this;
       //1 保存基类的信息
       await this.db.transaction(async t => {
         //创建基类表
         let _baseOrder = await self.create(params, t);
-        //将id 赋值
-        params.id = _baseOrder.id;
-        await childSve.createOrder(params, t);
 
         // 处理payment
-        if(payType != 2) {
+        if (payType != 2) {
           var payment = {
-
+            order_id: _baseOrder.id,
+            price: params.price,
+            channelName: channel.channelName,
+            companyName: "",
+            payType: payType,
+            payStatus: "10",
           };
-          this.paymentSve.create();
+          payment = await this.paymentSve.create(payment);
+          params.orderpay_id = payment.id;
         }
+        // 将id赋值
+        params.id = _baseOrder.id;
+
+        // 创建订单
+        await childSve.createOrder(params, t);
       });
       return system.getResultSuccess();
     } catch (error) {