处理查询订单

src/main/java/cn/chjyj/szwh/bean/OrderGoodsDetail.java

@@ -32,7 +32,9 @@ public class OrderGoodsDetail implements Serializable {
     @JSONField(name = "entrust_islicode")
     private String entrustIslicode;//委托方isli标识码
     private String islicode;
+    @JSONField(name = "goods_name")
     private String goodsName;//商品名称
+    @JSONField(name = "goods_image")
     private String goodsImage;//商品图片
     private String contractCode;//合约关联编码(订单交易isli标识码)
     private String orderIslicode;
@@ -44,10 +46,12 @@ public class OrderGoodsDetail implements Serializable {
     private String closeSerialNumber;//结算流水号
     private BigDecimal price;//单价
     private BigDecimal goodsPrice;//标的金额（不算服务费）
+    @JSONField(name = "service_charge")
     private BigDecimal serviceCharge;//服务费金额
     private BigDecimal earnestMoney;//商品保证金
     private Integer transactionCount;//交易数量
     private BigDecimal money;//商品总金额
+    @JSONField(name = "entrust_service_charge")
     private BigDecimal entrustServiceCharge;//委托方服务费
     private BigDecimal entrustMoney;//委托方金额
     private Integer goodsOwnership;//商品类型；1：所有权；2：使用权
@@ -56,6 +60,7 @@ public class OrderGoodsDetail implements Serializable {
     @JSONField(name = "charges_type")
     private Integer chargesType;//商品费用类型；1：免费；2：付费
     private String goodsIslicode;//商品isli标识码
+    @JSONField(name = "goods_entrust")
     private Integer goodsEntrust;//商品委托类型；1：转让；2：许可
     private Integer contractualPeriod;//委托周期；1：永久，2：单次，3：周期
     private Integer transactionClass;//交易种类；1：权属；2：商品

src/main/java/cn/chjyj/szwh/controller/api/OrderController.java

@@ -122,14 +122,15 @@ public class OrderController extends BaseController {
         Integer ilimit = StringUtils.isBlank(limit)?20:Integer.valueOf(limit);
 
         // 获取订单信息
-        List odlist = orderService.queryOrder(qmap,iuserRole,ipage,ilimit);
+        Map retmap = orderService.queryOrder(qmap,iuserRole,ipage,ilimit);
         long end = System.currentTimeMillis();
         long howuse = (end-start)/1000l;
         //赋值
         JSONObject outjson = new JSONObject();
-        outjson.put("code","200");
+        outjson.put("code",200);
         outjson.put("msg","成功");
-        outjson.put("data",odlist);
+        // 两层data 包裹
+        outjson.put("data",retmap);
         outjson.put("useTime",howuse+"s");
         return outjson;
     }

src/main/java/cn/chjyj/szwh/service/OrderService.java

@@ -101,7 +101,7 @@ public interface OrderService {
      * @param limit
      * @return
      */
-    List queryOrder(Map qmap,Integer userrole,Integer page,Integer limit);
+    Map<String,Object> queryOrder(Map qmap,Integer userrole,Integer page,Integer limit);
 
     /**
      * 创建订单

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

@@ -756,9 +756,9 @@ public class OrderServiceImpl implements OrderService {
      * @return
      */
     @Override
-    public List queryOrder(Map qmap, Integer userrole, Integer page, Integer limit) {
+    public Map<String,Object> queryOrder(Map qmap, Integer userrole, Integer page, Integer limit) {
         int start = page > 1 ? (page - 1) * limit : 0;
-
+        Map outmap = new HashMap();
         //订单结算 todo
         List<Order> orderList = orderMapper.getOrderList(qmap, start, limit);
         //最后的结果返回list
@@ -805,10 +805,13 @@ public class OrderServiceImpl implements OrderService {
 
             // 处理订单商品返回json格式
             List odgList = new ArrayList();
-            //订单商品
+            //订单商品详情 start
             List<OrderGoodsDetail> orderGoodsDetailList = orderGoodsDetailMapper.getOrderGoodsDetailByBatchCode(od.getBatchcode());
             for (OrderGoodsDetail ogd : orderGoodsDetailList) {
-                Map odgmap =new HashMap();
+                //Map odgmap =new HashMap();
+                // 利用goods detail的信息来初始化
+                Map odgmap = JSONObject.parseObject(JSON.toJSONString(ogd));
+                //补充其他元素
                 retmap.put("close_status", ogd.getCloseStatus());
                 // 查询委托方信息
                 OrderUser entrUser = orderUserMapper.getUserOrder(ogd.getBatchcode(),ogd.getIslicode());
@@ -860,6 +863,7 @@ public class OrderServiceImpl implements OrderService {
                 //
                 odgList.add(odgmap);
             }
+            // 订单商品详情list end
             // 商品详情
             retmap.put("order_detail", odgList);
             //
@@ -870,12 +874,16 @@ public class OrderServiceImpl implements OrderService {
             if (userrole == 1 && od.getStatus() == 3) {
                 retmap.put("status", 4);
             }
-            retmap.put("search_close_money", new BigDecimal(0));
-            retmap.put("total_close_money", new BigDecimal(0));
-
+            //retmap.put("search_close_money", new BigDecimal(0));
+            //retmap.put("total_close_money", new BigDecimal(0));
+            //
             outlist.add(retmap);
-        }
-        return outlist;
+        }            // 最外层
+        outmap.put("total_close_money",new BigDecimal("0.00"));
+        outmap.put("limit",limit);
+        outmap.put("page",page);
+        outmap.put("data",outlist);
+        return outmap;
     }
 
     /**