Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/enterprise/modules/base/dao/BillInfoDAO.java

@@ -21,6 +21,6 @@ public interface BillInfoDAO {
     int delete(String id);
     List<BillInfo> list();
     List<BillInfo> search(Map<String,Object> searchParams, List<Sort> sortList);
-    List<DueListDTO> dueList();
+    List<DueListDTO> dueList(String billId);
     BillInfo getDueDetail();
 }

common/src/main/java/com/jpsoft/enterprise/modules/base/service/BillInfoService.java

@@ -22,6 +22,6 @@ public interface BillInfoService {
     int delete(String id);
     List<BillInfo> list();
     Page<BillInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
-    List<DueListDTO> dueList();
+    List<DueListDTO> dueList(String billId);
     BillInfo getDueDetail();
 }

common/src/main/java/com/jpsoft/enterprise/modules/base/service/impl/BillInfoServiceImpl.java

@@ -109,9 +109,9 @@ public class BillInfoServiceImpl implements BillInfoService {
     }
 
     @Override
-    public List<DueListDTO> dueList() {
+    public List<DueListDTO> dueList(String billId) {
         // TODO Auto-generated method stub
-        return billInfoDAO.dueList();
+        return billInfoDAO.dueList(billId);
     }
 
     @Override

common/src/main/resources/mapper/base/BillInfo.xml

@@ -118,12 +118,12 @@
         <result property="companyName" column="company_name" />
         <result property="payTime" column="pay_time" />
     </resultMap>
-    <select id="dueList" resultMap="DueListDTOMap">
+    <select id="dueList" parameterType="string" resultMap="DueListDTOMap">
         SELECT c.company_name,d.pay_time FROM base_bill_info a
         LEFT JOIN base_bill_detail_info b ON a.id_ = b.bill_id
         LEFT JOIN base_company_info c ON b.company_id = c.id_
         LEFT JOIN base_order_info d ON b.order_id = d.id_
-        WHERE a.wx_show = TRUE
+        WHERE a.id_ = #{0}
         AND d.pay_time IS NOT NULL
         ORDER BY d.pay_time ASC
     </select>

web/src/main/java/com/jpsoft/enterprise/modules/mobile/controller/BillInfoApiController.java

@@ -43,13 +43,19 @@ public class BillInfoApiController {
 
         try {
             BillInfo billInfo = billInfoService.getDueDetail();
-            map.put("info", billInfo);
-            List<DueListDTO> listDTOS = billInfoService.dueList();
-            map.put("list", listDTOS);
+            if(billInfo != null) {
+                map.put("info", billInfo);
+                List<DueListDTO> listDTOS = billInfoService.dueList(billInfo.getId());
+                map.put("list", listDTOS);
 
-            messageResult.setData(map);
-            messageResult.setResult(true);
-            messageResult.setCode(200);
+                messageResult.setData(map);
+                messageResult.setResult(true);
+                messageResult.setCode(200);
+            }
+            else {
+                messageResult.setResult(false);
+                messageResult.setMessage("无展示信息！");
+            }
         } catch (Exception ex) {
             log.error(ex.getMessage(),ex);
             messageResult.setCode(400);

web/src/main/resources/application-dev.yml

@@ -7,9 +7,9 @@ spring:
   datasource:
 
     #开发环境
-     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/enterprises_federation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-     username: root
-     password: jpsoft2016
+#     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/enterprises_federation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#     username: root
+#     password: jpsoft2016
 
     #测试环境
 #     url: jdbc:log4jdbc:mysql://47.92.161.104:3336/jp_housekeeper_2.0?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
@@ -17,9 +17,9 @@ spring:
 #     password: jpsoft8121234
 
     #正式环境
-#     url: jdbc:log4jdbc:mysql://122.189.98.152:3336/jp_housekeeper?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#     username: root
-#     password: jpsoft8121234
+     url: jdbc:log4jdbc:mysql://122.189.98.152:3336/jp_housekeeper?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+     username: root
+     password: jpsoft8121234