From 8f0ed0f05154913c54a9af8396389739df27d7d7 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Wed, 28 Feb 2018 16:13:01 +0800
Subject: [PATCH] update

---
 .../manage/bill/core/impl/BillOrderServiceImpl.java   | 11 +----------
 .../payment/manage/mappers/bill/BillOrderMapper.java  |  2 --
 .../payment/manage/mappers/bill/BillOrderMapper.xml   |  9 ---------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/bill/core/impl/BillOrderServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/bill/core/impl/BillOrderServiceImpl.java
index 53e8b3b8e..884ae0272 100644
--- a/src/main/java/au/com/royalpay/payment/manage/bill/core/impl/BillOrderServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/bill/core/impl/BillOrderServiceImpl.java
@@ -55,17 +55,8 @@ public class BillOrderServiceImpl implements BillOrderService {
         if (bill.getIntValue("client_id") != client_id) {
             throw new BadRequestException("You have no right to check this bill");
         }
-        PageList<JSONObject> list = billOrderMapper.queryWithWechatInfo(bill_id, queryBillOrderBean.toParams(),
+        PageList<JSONObject> list = billOrderMapper.query(bill_id, queryBillOrderBean.toParams(),
                 new PageBounds(queryBillOrderBean.getPage(), queryBillOrderBean.getLimit()));
-        for (JSONObject jsonObject : list) {
-            if ("Alipay".equals(jsonObject.getString("channel"))) {
-                JSONObject alipayInfo = customerRelationAlipayMapper.findCustomerByUserId(jsonObject.getString("customer_id"));
-                if (alipayInfo != null) {
-                    jsonObject.put("nickname", alipayInfo.getString("nickname"));
-                    jsonObject.put("headimg", alipayInfo.getString("headimg"));
-                }
-            }
-        }
         return PageListUtils.buildPageListResult(list);
     }
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillOrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillOrderMapper.java
index f0a040470..d9b2674ee 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillOrderMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillOrderMapper.java
@@ -35,7 +35,5 @@ public interface BillOrderMapper {
 
     PageList<JSONObject> query(@Param("bill_id") String bill_id, @Param("param") JSONObject jsonObject, PageBounds pageBounds);
 
-    PageList<JSONObject> queryWithWechatInfo(@Param("bill_id") String bill_id, @Param("param") JSONObject jsonObject, PageBounds pageBounds);
-
     JSONObject analysis(@Param("bill_id")String bill_id,@Param("param")JSONObject jsonObject);
 }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/bill/BillOrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/bill/BillOrderMapper.xml
index 934ea32f5..f9e9ef134 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/bill/BillOrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/bill/BillOrderMapper.xml
@@ -21,15 +21,6 @@
         </if>
         order by create_time
     </select>
-    <select id="queryWithWechatInfo" resultType="com.alibaba.fastjson.JSONObject">
-        select o.*,r.nickname,r.headimg from pmt_bill_order o left join sys_customer_relation r on r.wechat_openid = o.customer_id
-        where
-        bill_id = #{bill_id}
-        <if test="param.status != null">
-            and order_status = #{param.status}
-        </if>
-        order by create_time
-    </select>
 
     <select id="analysis" resultType="com.alibaba.fastjson.JSONObject">
         select count(1) counts from pmt_bill_order