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

esign-sve-order/app/base/service/impl/eorder/eorderproductSve.js

@@ -36,7 +36,8 @@ class EorderproductService extends ServiceBase {
       }
       }
       let p_list = await this.eorderDao.model.findAll({
       let p_list = await this.eorderDao.model.findAll({
         where:{
         where:{
-          merchant_id: this.trim(params.merchant_id)
+          merchant_id: this.trim(params.merchant_id),
+          live_status: '20',
         },
         },
         attributes:['id']
         attributes:['id']
       });
       });
@@ -55,7 +56,7 @@ class EorderproductService extends ServiceBase {
             [this.db.Op.in]:ids
             [this.db.Op.in]:ids
           }
           }
         },
         },
-        attributes:['product_id']
+        attributes:['product_id', 'price']
       });
       });
       return system.getResultSuccess(list);
       return system.getResultSuccess(list);
   }
   }