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

center-order/app/base/service/impl/dbcorder/orderinfoSve.js

@@ -2598,6 +2598,9 @@ class OrderInfoService extends ServiceBase {
         if (!pobj.actionBody.needNo) {
             return system.getResult(null, "阿里需求号不能为空，100110");
         }
+        if (!pobj.actionBody.created_at) {
+            return system.getResult(null, "商标创建时间不能为空，100190");
+        }
         var orderInfo = await this.dao.model.findOne({
             where: {channelOrderNo: pobj.actionBody.channelOrderNo, uapp_id: pobj.appInfo.uapp_id}, raw: true
         });
@@ -2611,7 +2614,10 @@ class OrderInfoService extends ServiceBase {
         ab.channelNeedNo = ab.needNo;
         ab.channelUserId = userInfo.channel_userid;
         ab.ownerUserId = userInfo.channel_userid;
-        ab.payTime = ab.payTime || new Date();
+        ab.payTime = ab.payTime;
+        if(!ab.payTime){
+            delete ab.payTime;
+        }
         ab.orderStatus = 2;
         ab.totalSum = ab.price;
         ab.payTotalSum = ab.price;
@@ -2644,7 +2650,9 @@ class OrderInfoService extends ServiceBase {
         }
         orderInfo.refundSum = pobj.actionBody.refundSum || orderInfo.payTotalSum;
         orderInfo.orderStatus = 16;
-        orderInfo.refundTime = pobj.actionBody.refundTime || new Date();
+        if(pobj.actionBody.refundTime){
+            orderInfo.refundTime = pobj.actionBody.refundTime ;
+        }
         await this.dao.update(orderInfo);
         return system.getResultSuccess();