合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/BillController.java

@@ -4,6 +4,7 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.service.BillServiceI;
+import com.sun.org.apache.regexp.internal.RE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -72,4 +73,27 @@ public class BillController extends BaseController {
 		responseBean.addSuccess(billInvoiceMap);
 		return responseBean;
 	}
+
+	@ApiOperation(value = "获取历史缴费", notes = "获取历史缴费")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
+	@RequestMapping(value = "/bill/pay/history", method = RequestMethod.GET)
+	public ResponseBean payHistory(HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = billServiceI.payHistory(userElement);
+		return responseBean;
+	}
+
+	@ApiOperation(value = "获取订单详情", notes = "获取订单详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "orderNumber", value = "订单号")
+	})
+	@RequestMapping(value = "/bill/order/info/{orderNumber}", method = RequestMethod.GET)
+	public ResponseBean getOrderInfo(HttpSession session, @PathVariable("orderNumber") String orderNumber) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = billServiceI.getOrderInfo(orderNumber);
+		return responseBean;
+	}
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillMapper.java

@@ -3,6 +3,9 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TpBill;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface TpBillMapper {
@@ -19,4 +22,6 @@ public interface TpBillMapper {
     int updateByPrimaryKey(TpBill record);
 
     TpBill selectById(@Param("id") Integer id);
+
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillOrderMapper.java

@@ -1,10 +1,7 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpBillOrder;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.ResultMap;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -29,7 +26,33 @@ public interface TpBillOrderMapper {
      */
     int batchInsertSelective(List<TpBillOrder> list);
 
+    /**
+     * 根据订单查询， 所有数据
+     * @param orderNumber
+     * @return
+     */
     @ResultMap("BaseResultMap")
-    @Select("select * from tp_bill_order where order_bumber=#{orderNumber}")
+    @Select("select " +
+            "tbo.* from tp_bill_order tbo where tbo.order_bumber=#{orderNumber}")
     List<TpBillOrder> selectByOrderBumber(@Param("orderNumber") String orderNumber);
+
+    /**
+     * 根据房间号查询订单
+     * @param roomNoId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT tbo.* FROM tp_bill_order tbo LEFT JOIN tp_bill_invoice tbi on tbo.tp_bill_invoice_id = tbi.id " +
+            "WHERE tbi.room_no_id = #{roomNoId} GROUP BY tbo.order_bumber")
+    List<TpBillOrder> selectByRoomNoId(@Param("roomNoId") Integer roomNoId);
+
+    /**
+     * 根据订单号 查询缴费组
+     * @param orderBumber
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT * FROM tp_bill_order WHERE order_bumber = #{orderBumber} GROUP BY tp_bill_id")
+    List<TpBillOrder> selectByOrderNumberBill(@Param("orderBumber") String orderBumber);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillStatementMapper.java

@@ -2,6 +2,8 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpBillStatement;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface TpBillStatementMapper {
@@ -16,4 +18,14 @@ public interface TpBillStatementMapper {
     int updateByPrimaryKeySelective(TpBillStatement record);
 
     int updateByPrimaryKey(TpBillStatement record);
+
+    /**
+     * 根据小区id，缴费单id 查询
+     * @param communityId
+     * @param tpBillInvoiceId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select *  from tp_bill_statement where community_id = #{communityId} and bill_invoice_id = #{tpBillInvoiceId}")
+    TpBillStatement selectByCommunityIdAndBillInvoiceId(Integer communityId, Integer tpBillInvoiceId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpBillOrder.java

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpBillOrder {
     private Integer id;
@@ -31,6 +32,16 @@ public class TpBillOrder {
      */
     private String payPhone;
 
+    /**
+     * 订单总额
+     */
+    private Long sumPrice;
+
+    /**
+     * 缴费组集合
+     */
+    private List<TpBill> billList;
+
     public Integer getId() {
         return id;
     }
@@ -118,4 +129,20 @@ public class TpBillOrder {
     public void setPayPhone(String payPhone) {
         this.payPhone = payPhone;
     }
+
+    public Long getSumPrice() {
+        return sumPrice;
+    }
+
+    public void setSumPrice(Long sumPrice) {
+        this.sumPrice = sumPrice;
+    }
+
+    public List<TpBill> getBillList() {
+        return billList;
+    }
+
+    public void setBillList(List<TpBill> billList) {
+        this.billList = billList;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/BillServiceI.java

@@ -1,5 +1,6 @@
 package com.community.huiju.service;
 
+import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 
 import java.util.List;
@@ -23,4 +24,18 @@ public interface BillServiceI {
 	 * @return
 	 */
 	Map<String, Object> getBillInvoiceDetail(Integer communityId,Integer billInvoiceId);
+
+	/**
+	 * 获取缴费历史
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean payHistory(UserElement userElement);
+
+	/**
+	 * 订单详情
+	 * @param orderNumber
+	 * @return
+	 */
+	ResponseBean getOrderInfo(String orderNumber);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java

@@ -1,20 +1,20 @@
 package com.community.huiju.service.impl;
 
+import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.*;
-import com.community.huiju.model.TaSysRole;
-import com.community.huiju.model.TaUser;
-import com.community.huiju.model.TaUserVerify;
-import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.model.*;
 import com.community.huiju.service.BillServiceI;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author FXF
@@ -37,6 +37,15 @@ public class BillServiceImpl implements BillServiceI {
 
 	@Autowired
 	private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
+	@Autowired
+	private TpBillOrderMapper tpBillOrderMapper;
+
+	@Autowired
+	private TpBillMapper tpBillMapper;
+
+	@Autowired
+	private TpBillStatementMapper tpBillStatementMapper;
 	
 	/**
 	 * 根据payType分页获取缴费或未缴费的数据
@@ -54,17 +63,6 @@ public class BillServiceImpl implements BillServiceI {
 		 * 账单 关联的是房产,
  		 */
 
-//		TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userElement.getCommunityId(),
-//										userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
-//										userElement.getLevelId(), userElement.getRoomNoId());
-//		// 业主信息
-//		TaUser user = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
-//
-//		TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityAndAddressAndPhone(userElement.getCommunityId(),
-//				userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
-//				userElement.getLevelId(), userElement.getRoomNoId(), user.getLoginName());
-
-
 		//使用分页插件
 		Page<Map<String,Object>> page = PageHelper.startPage(pageNum, pageSize);
 		List<Map<String,Object>> billsList = tpBillInvoiceMapper.getBillsList(userElement.getCommunityId(), userElement.getRoomNoId(), payType);
@@ -92,4 +90,71 @@ public class BillServiceImpl implements BillServiceI {
 		billInvoiceDetail.put("payPrice", payPriceDouble);
 		return billInvoiceDetail;
 	}
+
+	@Override
+	public ResponseBean payHistory(UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+
+		//1. 查询所有订单
+		//2. 根据订单
+
+
+		// 所有订单
+		List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByRoomNoId(userElement.getRoomNoId());
+		billOrderList.forEach(e->{
+			// 缴费组
+			List<TpBill> billsCollect = billOrderList.stream().map(billOrder -> tpBillMapper.selectByPrimaryKey(billOrder.getTpBillId())).collect(Collectors.toList());
+			// 所有缴费组的总额
+			Long billCountPrice = billsCollect.stream().map(billCount -> Integer.parseInt(billCount.getPayPrice())).count();
+
+			e.setBillList(billsCollect);
+			e.setSumPrice(billCountPrice);
+		});
+
+		responseBean.addSuccess(billOrderList);
+		return responseBean;
+	}
+
+	@Override
+	public ResponseBean getOrderInfo(String orderNumber) {
+		ResponseBean responseBean = new ResponseBean();
+
+		/**
+		 * 1.根据订单号获取所有缴费组
+		 * 2.获取其中的一条缴费订单数据, 因为订单号再库里面是多条，取第一条就可以
+		 * 3.计算出所有缴费组的总额
+		 * 4.获取一个缴费的流水记录, 因为 订单号对应多个缴费单，每一个缴费单对应一个缴费流水, 然后通过缴费流水可以知道缴费人，缴费类型，缴费备注等等
+		 */
+
+		// 这个订单所有的缴费组记录, 拿到每一个缴费组的id
+		List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByOrderNumberBill(orderNumber);
+		if (CollectionUtils.isEmpty(billOrderList)) {
+			responseBean.addError("订单号不存在！");
+			return responseBean;
+		}
+		// 每个缴费组数据
+		List<TpBill> tpBillList = billOrderList.stream().map(e -> tpBillMapper.selectByPrimaryKey(e.getTpBillId())).collect(Collectors.toList());
+		// 所有缴费组的总额
+		Long billCountPrice = tpBillList.stream().map(billCount -> Integer.parseInt(billCount.getPayPrice())).count();
+
+		// 因为订单号是多条，取第一条即可
+		TpBillOrder tpBillOrder = billOrderList.get(0);
+
+		// 获取一条流水
+		TpBillStatement tpBillStatement = tpBillStatementMapper.selectByCommunityIdAndBillInvoiceId(tpBillOrder.getCommunityId(), tpBillOrder.getTpBillInvoiceId());
+
+
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("orderNumber", orderNumber);
+		map.put("createDate", tpBillOrder.getCreateDate());
+		map.put("sumPrice", billCountPrice);
+		map.put("payName", tpBillStatement.getPayName());
+		map.put("updateDate", tpBillOrder.getUpdateDate());
+		map.put("payType", tpBillStatement.getPayType());
+		map.put("payRemark", tpBillStatement.getPayRemark());
+		map.put("list", tpBillList);
+
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
 }