Browse Source

补遗缺失字段

master
xyiege 3 years ago
parent
commit
7f738fbbef
  1. 16
      src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
  2. 8
      src/main/java/cn/chjyj/szwh/vo/AdOrderVO.java
  3. 2
      src/main/resources/mapper/szwh/OrderMapper.xml

16
src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java

@ -176,6 +176,12 @@ public class OrderServiceImpl implements OrderService {
// 格式化时间 // 格式化时间
//tomap.put("createtime", sdf.format(aod.getCreatetime())); //tomap.put("createtime", sdf.format(aod.getCreatetime()));
// 购买者
OrderUser oduser = orderUserMapper.getUserOrder(aod.getBatchcode(), aod.getBuy_islicode());
if(oduser!=null) {
tomap.put("buy_username", oduser.getName());
}
// 获取授权方 // 获取授权方
String entrustName = ""; String entrustName = "";
JSONObject ujson = SzwhApiUtils.getApiUser(aod.getEntrust_islicode()); JSONObject ujson = SzwhApiUtils.getApiUser(aod.getEntrust_islicode());
@ -197,6 +203,10 @@ public class OrderServiceImpl implements OrderService {
tomap.put("total_money", aod.getTotal_money()); tomap.put("total_money", aod.getTotal_money());
tomap.put("status", aod.getStatus()); tomap.put("status", aod.getStatus());
tomap.put("id", aod.getId()); tomap.put("id", aod.getId());
//下单时间
tomap.put("createtime", aod.getCreatetime());
//订单编号
tomap.put("batchcode", aod.getBatchcode());
// //
relist.add(tomap); relist.add(tomap);
} }
@ -206,11 +216,7 @@ public class OrderServiceImpl implements OrderService {
// Map tomap = new HashMap(); // Map tomap = new HashMap();
// //订单编号 // //订单编号
// tomap.put("batchcode", od.getBatchcode()); // tomap.put("batchcode", od.getBatchcode());
// // 购买者
// OrderUser oduser = orderUserMapper.getUserOrder(od.getBatchcode(), od.getBuyIslicode());
// if(oduser!=null) {
// tomap.put("buy_username", oduser.getName());
// }
// //下单时间 // //下单时间
// tomap.put("createtime", sdf.format(od.getCreatetime())); // tomap.put("createtime", sdf.format(od.getCreatetime()));
// //entrust_name 委托人信息, // //entrust_name 委托人信息,

8
src/main/java/cn/chjyj/szwh/vo/AdOrderVO.java

@ -14,6 +14,7 @@ public class AdOrderVO {
private Integer goods_entrust; private Integer goods_entrust;
private Integer charges_type; private Integer charges_type;
private String buy_username;//订单用户name 别名 private String buy_username;//订单用户name 别名
private String buy_islicode;// 购物者
public Integer getId() { public Integer getId() {
return id; return id;
@ -95,6 +96,11 @@ public class AdOrderVO {
this.buy_username = buy_username; this.buy_username = buy_username;
} }
public String getBuy_islicode() {
return buy_islicode;
}
public void setBuy_islicode(String buy_islicode) {
this.buy_islicode = buy_islicode;
}
} }

2
src/main/resources/mapper/szwh/OrderMapper.xml

@ -67,7 +67,7 @@
<!-- 查询订单集合 --> <!-- 查询订单集合 -->
<select id="queryOrderList" parameterType="java.util.Map" resultType="cn.chjyj.szwh.vo.AdOrderVO"> <select id="queryOrderList" parameterType="java.util.Map" resultType="cn.chjyj.szwh.vo.AdOrderVO">
SELECT o.id,o.batchcode,o.status,o.total_money, SELECT o.id,o.batchcode,o.status,o.total_money,o.buy_islicode,
og.goods_name,og.createtime,og.entrust_islicode,og.goods_entrust,og.charges_type, og.goods_name,og.createtime,og.entrust_islicode,og.goods_entrust,og.charges_type,
ou.name as buy_username ou.name as buy_username
FROM `order` o FROM `order` o

Loading…
Cancel
Save