ucommuneOrder pull

center-order/app/base/db/models/dbcorder/orderinfo.js

@@ -25,7 +25,8 @@ module.exports = (db, DataTypes) => {
     },// 订单状态: 1: 待付款, 2: 已付款, 4: 服务中, 8: 已完成, 16: 已退款, 32: 已作废
     },// 订单状态: 1: 待付款, 2: 已付款, 4: 服务中, 8: 已完成, 16: 已退款, 32: 已作废
     totalSum            :DataTypes.DECIMAL(12, 2),//  订单总额(产品价格×优惠费率×订单件数)                                                                                                                                    
     totalSum            :DataTypes.DECIMAL(12, 2),//  订单总额(产品价格×优惠费率×订单件数)                                                                                                                                    
     payTotalSum         :DataTypes.DECIMAL(12, 2),//  订单付款总额
     payTotalSum         :DataTypes.DECIMAL(12, 2),//  订单付款总额
-    refundSum           :DataTypes.DECIMAL(12, 2),//  退款金额     
+    refundSum           :DataTypes.DECIMAL(12, 2),//  退款金额
+    refundTime          :DataTypes.DATE, //2020/6/17 lin新增 退款时间 
     totalServiceCharge  :DataTypes.DECIMAL(12, 2),//  服务费总额（产品配置的服务费*订单件数）                                                                                                                                
     totalServiceCharge  :DataTypes.DECIMAL(12, 2),//  服务费总额（产品配置的服务费*订单件数）                                                                                                                                
     totalPublicExpense  :DataTypes.DECIMAL(12, 2),//  官费总额（产品配置的官费*订单件数）   
     totalPublicExpense  :DataTypes.DECIMAL(12, 2),//  官费总额（产品配置的官费*订单件数）   
     totalProfitSum      :DataTypes.DECIMAL(12, 2),//  订单毛利润总额（订单总额-官费总额）  
     totalProfitSum      :DataTypes.DECIMAL(12, 2),//  订单毛利润总额（订单总额-官费总额）  
@@ -43,7 +44,7 @@ module.exports = (db, DataTypes) => {
       version: true,
       version: true,
       freezeTableName: true,
       freezeTableName: true,
       timestamps: true,
       timestamps: true,
-      updatedAt: false,
+      updated_at: true,// 2020 0618 lin修改 
       //freezeTableName: true,
       //freezeTableName: true,
       // define the table's name
       // define the table's name
       tableName: 'c_order_info',
       tableName: 'c_order_info',

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

@@ -17,7 +17,7 @@ class OrderInfoService extends ServiceBase {
     // var sql = "select `isSolution`,`orderNo`,`channelServiceNo`,`channelOrderNo`,`channelUserId`,`ownerUserId`,`payTime`,`quantity`,`serviceQuantity`,`orderStatusName`,`orderStatus`,`totalSum`,`payTotalSum`,`refundSum`,"
     // var sql = "select `isSolution`,`orderNo`,`channelServiceNo`,`channelOrderNo`,`channelUserId`,`ownerUserId`,`payTime`,`quantity`,`serviceQuantity`,`orderStatusName`,`orderStatus`,`totalSum`,`payTotalSum`,`refundSum`,"
     //   + " `invoiceApplyStatus`,`opNotes`,`channelItemCode`,`channelItemName`,`price`,priceDesc,priceTypeName,channelItemAppendName,`serviceItemCode`,`picUrl`,created_at from v_order where uapp_id=:uapp_id";
     //   + " `invoiceApplyStatus`,`opNotes`,`channelItemCode`,`channelItemName`,`price`,priceDesc,priceTypeName,channelItemAppendName,`serviceItemCode`,`picUrl`,created_at from v_order where uapp_id=:uapp_id";
     // var sqlCount = "select count(1) as dataCount from v_order where uapp_id=:uapp_id";
     // var sqlCount = "select count(1) as dataCount from v_order where uapp_id=:uapp_id";
-    var sql = "select `orderNo`,`channelUserId`,`payTime`,`orderStatusName`,`orderStatus`,`totalSum`,`payTotalSum`,`refundSum`,"
+    var sql = "select `orderNo`,`channelUserId`,`payTime`,`orderStatusName`,`orderStatus`,`totalSum`,`payTotalSum`,`refundSum`,`refundTime`,"
       + " `channelItemCode`,`channelItemName`,`price`,priceDesc,priceTypeName,`serviceItemCode`,`picUrl`,created_at from v_order where uapp_id=:uapp_id";
       + " `channelItemCode`,`channelItemName`,`price`,priceDesc,priceTypeName,`serviceItemCode`,`picUrl`,created_at from v_order where uapp_id=:uapp_id";
     var sqlCount = "select count(1) as dataCount from v_order where uapp_id=:uapp_id";
     var sqlCount = "select count(1) as dataCount from v_order where uapp_id=:uapp_id";
 
 
@@ -31,8 +31,8 @@ class OrderInfoService extends ServiceBase {
     if (actionBody.startTime && actionBody.entTime) {
     if (actionBody.startTime && actionBody.entTime) {
       var startTime = actionBody.startTime.trim() + " 00:00:00";
       var startTime = actionBody.startTime.trim() + " 00:00:00";
       var entTime = actionBody.entTime + " 23:59:59";
       var entTime = actionBody.entTime + " 23:59:59";
-      sql += " and created_at >=:startTime and  created_at<=:entTime";
-      sqlCount += " and created_at >=:startTime and  created_at<=:entTime";
+      sql += " and updated_at >=:startTime and  updated_at<=:entTime";
+      sqlCount += " and updated_at >=:startTime and  updated_at<=:entTime";
       paramWhere.startTime = startTime;
       paramWhere.startTime = startTime;
       paramWhere.entTime = entTime;
       paramWhere.entTime = entTime;
     }
     }