Skip to content

A
Aidea
Commit 7f3faa0d authored by 谢希宇's avatar 谢希宇
Browse files
Options

Aidea product update by Strive Date 2020-11-28

parent 85ce450c
Show whitespace changes
Inline Side-by-side
Showing with 101 additions and 86 deletions
aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderSendOut.html
View file @ 7f3faa0d
...@@ -58,12 +58,12 @@ ...@@ -58,12 +58,12 @@
<section class="content-header"> <section class="content-header">
<h1> <h1>
需求清单管理 需求清单出库管理
<small>需求清单管理</small> <small>需求清单出库管理</small>
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="#"><i class="fa fa-dashboard"></i>首页</a></li> <li><a href="#"><i class="fa fa-dashboard"></i>首页</a></li>
<li><a class="active">需求清单管理</a></li> <li><a class="active">需求清单出库管理</a></li>
</ol> </ol>
</section> </section>
......
aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderlistout.html
View file @ 7f3faa0d
...@@ -87,12 +87,12 @@ ...@@ -87,12 +87,12 @@
<section class="content-header"> <section class="content-header">
<h1> <h1>
需求清单管理 需求清单出库管理
<small>需求清单管理</small> <small>需求清单出库管理</small>
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a><i class="fa fa-dashboard"></i>首页</a></li> <li><a><i class="fa fa-dashboard"></i>首页</a></li>
<li><a class="active">需求清单管理列表</a></li> <li><a class="active">需求清单出库管理列表</a></li>
</ol> </ol>
</section> </section>
...@@ -120,22 +120,22 @@ ...@@ -120,22 +120,22 @@
<input type="text" class="form-control" <input type="text" class="form-control"
name="courierNumber" placeholder="顺丰运单号"> name="courierNumber" placeholder="顺丰运单号">
</div> </div>
<div class="col-xs-2"> <!--<div class="col-xs-2">-->
<input type="text" class="form-control" <!--<input type="text" class="form-control"-->
name="startOrderAmount" placeholder="订单金额开始区间"> <!--name="startOrderAmount" placeholder="订单金额开始区间">-->
</div> <!--</div>-->
<div class="col-xs-2"> <!--<div class="col-xs-2">-->
<input type="text" class="form-control" <!--<input type="text" class="form-control"-->
name="endOrderAmount" placeholder="订单金额结束区间"> <!--name="endOrderAmount" placeholder="订单金额结束区间">-->
</div> <!--</div>-->
<div class="col-xs-2"> <!--<div class="col-xs-2">-->
<input type="text" class="form-control" <!--<input type="text" class="form-control"-->
name="startPayAmount" placeholder="付款金额开始区间"> <!--name="startPayAmount" placeholder="付款金额开始区间">-->
</div> <!--</div>-->
<div class="col-xs-2"> <!--<div class="col-xs-2">-->
<input type="text" class="form-control" <!--<input type="text" class="form-control"-->
name="endPayAmount" placeholder="付款金额结束区间"> <!--name="endPayAmount" placeholder="付款金额结束区间">-->
</div> <!--</div>-->
<div class="col-xs-2"> <div class="col-xs-2">
<select id="status" name="status" class="form-control required"> <select id="status" name="status" class="form-control required">
<!--<option value="">请选择订单状态</option>--> <!--<option value="">请选择订单状态</option>-->
...@@ -198,15 +198,16 @@ ...@@ -198,15 +198,16 @@
<th>订单编码</th> <th>订单编码</th>
<th>咨询单编码</th> <th>咨询单编码</th>
<th>产品名称</th> <th>产品名称</th>
<th>订单金额</th> <!--<th>订单金额</th>-->
<th>付款金额</th> <!--<th>付款金额</th>-->
<th>昵称</th> <!--<th>昵称</th>-->
<th>openid</th> <!--<th>openid</th>-->
<th>顺丰运单号</th> <th>顺丰运单号</th>
<th>订单状态</th> <th>订单状态</th>
<th>支付交易号</th> <th>支付交易号</th>
<th>是否开票</th> <th>是否开票</th>
<th>创建时间</th> <th>创建时间</th>
<th>出库时间</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
...@@ -331,22 +332,21 @@ ...@@ -331,22 +332,21 @@
{ {
"mData": "productName" "mData": "productName"
}, },
{ // {
"mData": "orderAmount" // "mData": "orderAmount"
} // }
, // ,
{ // {
"mData": "totalAmount" // "mData": "totalAmount"
} // }
, // ,
{ // {
"mData": "nickName" // "mData": "nickName"
} // }
, // ,
{ // {
"mData": "openid" // "mData": "openid"
} // },
,
{ {
"mData": "courierNumber" "mData": "courierNumber"
} }
...@@ -368,6 +368,10 @@ ...@@ -368,6 +368,10 @@
"mData": "createTime" "mData": "createTime"
} }
, ,
{
"mData": "outTime"
}
,
{ {
"mData": "id" "mData": "id"
} }
...@@ -400,45 +404,45 @@ ...@@ -400,45 +404,45 @@
return a; return a;
} }
} }
// ,
// {
// "aTargets": [4],
// "mData": "orderAmount",
// "mRender": function (a, b, c, d) {
// return a;
// }
// }
// ,
// {
// "aTargets": [5],
// "mData": "totalAmount",
// "mRender": function (a, b, c, d) {
// return a;
// }
// }
// ,
// {
// "aTargets": [6],
// "mData": "nickName",
// "mRender": function (a, b, c, d) {
// if (a) {
// return a.slice(0, 1) + '*' + a.slice(2, 3);
// } else {
// return null;
// }
// }
// }
// ,
// {
// "aTargets": [4],
// "mData": "openid",
// "mRender": function (a, b, c, d) {
// return a;
// }
// }
, ,
{ {
"aTargets": [4], "aTargets": [4],
"mData": "orderAmount",
"mRender": function (a, b, c, d) {
return a;
}
}
,
{
"aTargets": [5],
"mData": "totalAmount",
"mRender": function (a, b, c, d) {
return a;
}
}
,
{
"aTargets": [6],
"mData": "nickName",
"mRender": function (a, b, c, d) {
if (a) {
return a.slice(0, 1) + '*' + a.slice(2, 3);
} else {
return null;
}
}
}
,
{
"aTargets": [7],
"mData": "openid",
"mRender": function (a, b, c, d) {
return a;
}
}
,
{
"aTargets": [8],
"mData": "courierNumber", "mData": "courierNumber",
"mRender": function (a, b, c, d) { "mRender": function (a, b, c, d) {
return a; return a;
...@@ -446,7 +450,7 @@ ...@@ -446,7 +450,7 @@
} }
, ,
{ {
"aTargets": [9], "aTargets": [5],
"mData": "status", "mData": "status",
"mRender": function (a, b, c, d) { "mRender": function (a, b, c, d) {
if (a == '0') { if (a == '0') {
...@@ -465,7 +469,7 @@ ...@@ -465,7 +469,7 @@
} }
}, },
{ {
"aTargets": [10], "aTargets": [6],
"mData": "tradeNo", "mData": "tradeNo",
"mRender": function (a, b, c, d) { "mRender": function (a, b, c, d) {
return a; return a;
...@@ -473,7 +477,7 @@ ...@@ -473,7 +477,7 @@
} }
, ,
{ {
"aTargets": [11], "aTargets": [7],
"mData": "confirm", "mData": "confirm",
"mRender": function (a, b, c, d) { "mRender": function (a, b, c, d) {
return a == null ? '否':'是'; return a == null ? '否':'是';
...@@ -481,7 +485,7 @@ ...@@ -481,7 +485,7 @@
} }
, ,
{ {
"aTargets": [12], "aTargets": [8],
"mData": "createTime", "mData": "createTime",
"mRender": function (a, b, c, d) { "mRender": function (a, b, c, d) {
return formatDates(a); return formatDates(a);
...@@ -489,7 +493,15 @@ ...@@ -489,7 +493,15 @@
} }
, ,
{ {
"aTargets": [13], "aTargets": [9],
"mData": "outTime",
"mRender": function (a, b, c, d) {
return a;
}
}
,
{
"aTargets": [10],
"mData": "id", "mData": "id",
"mRender": function (a, b, c, d) { "mRender": function (a, b, c, d) {
var html = '#if($shiro.hasPermission("qy:order:edit"))'; var html = '#if($shiro.hasPermission("qy:order:edit"))';
......
aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.xml
View file @ 7f3faa0d
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
<result column="cancel_time" property="cancelTime"/> <result column="cancel_time" property="cancelTime"/>
<result column="sendExpressDateStr" property="sendExpressDateStr"/> <result column="sendExpressDateStr" property="sendExpressDateStr"/>
<result column="acceptExpressDateStr" property="acceptExpressDateStr"/> <result column="acceptExpressDateStr" property="acceptExpressDateStr"/>
<result column="outTime" property="outTime"/>
<collection property="list" ofType="com.cftech.order.model.ProductVO"> <collection property="list" ofType="com.cftech.order.model.ProductVO">
<result column="product_name" property="productName"/> <result column="product_name" property="productName"/>
</collection> </collection>
...@@ -326,14 +327,15 @@ ...@@ -326,14 +327,15 @@
cs.consult_id consultCode, cs.consult_id consultCode,
CONVERT(AES_DECRYPT(f.nickname,'aideakey') USING UTF8) nickName, CONVERT(AES_DECRYPT(f.nickname,'aideakey') USING UTF8) nickName,
o.address_id, o.address_id,
order_time, o.order_time,
cancel_time, o.cancel_time,
DATE_FORMAT(aw.send_express_date, '%Y-%m-%d %H:%i') sendExpressDateStr, DATE_FORMAT(aw.send_express_date, '%Y-%m-%d %H:%i') sendExpressDateStr,
DATE_FORMAT(aw.accept_express_date, '%Y-%m-%d %H:%i') acceptExpressDateStr, DATE_FORMAT(aw.accept_express_date, '%Y-%m-%d %H:%i') acceptExpressDateStr,
t.id as productId, t.id as productId,
CONVERT ( AES_DECRYPT( m.`name`, 'aideakey' ) USING UTF8 ) memberName, CONVERT ( AES_DECRYPT( m.`name`, 'aideakey' ) USING UTF8 ) memberName,
CONVERT ( AES_DECRYPT( m.phone, 'aideakey' ) USING UTF8 ) memberPhone, CONVERT ( AES_DECRYPT( m.phone, 'aideakey' ) USING UTF8 ) memberPhone,
a.address a.address,
DATE_FORMAT(aw.create_time, '%Y-%m-%d %H:%i') outTime
FROM t_order o FROM t_order o
LEFT JOIN t_aidea_consult_sheet cs ON o.consult_id = cs.id LEFT JOIN t_aidea_consult_sheet cs ON o.consult_id = cs.id
LEFT JOIN t_shipping_address s ON o.address_id = s.id LEFT JOIN t_shipping_address s ON o.address_id = s.id
......
aidea-modules/order-module/src/main/java/com/cftech/order/model/Order.java
View file @ 7f3faa0d
...@@ -144,6 +144,7 @@ public class Order extends OrderDetail implements Serializable { ...@@ -144,6 +144,7 @@ public class Order extends OrderDetail implements Serializable {
private String nickName;//患者昵称 private String nickName;//患者昵称
private String sendExpressDateStr;//发件时间 private String sendExpressDateStr;//发件时间
private String acceptExpressDateStr;//签收时间 private String acceptExpressDateStr;//签收时间
private String outTime;//出库时间
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment