yuhaitao14 7 years ago
parent
commit
b9c5a4771e

+ 23 - 2
shop/src/main/java/com/zskk/shop/controller/api/ApiController.java

@@ -67,7 +67,28 @@ public class ApiController {
 	}
 	}
 	
 	
 	@RequestMapping("refundOrders")
 	@RequestMapping("refundOrders")
-	public ControllerResult refundOrders(@RequestParam("stime") String stime, @RequestParam("etime") String time){
-		return null;
+	public ControllerResult refundOrders(@RequestParam("stime") String stime, @RequestParam("etime") String etime, 
+			@RequestParam("page") Integer page, @RequestParam("pageSize") Integer pageSize){
+		Integer s = null;
+		Integer e = null;
+		
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		try{
+			s = (int)(format.parse(stime).getTime()/1000);
+			e = (int)(format.parse(etime).getTime()/1000);
+		}catch (Exception exception) {
+			return new ControllerResult(ErrorConstant.PARAM_ERROR);
+		}
+		
+		List<BuyOrderItem> items = buyOrderService.queryRefundItems(s, e, page, pageSize);
+		Integer count			 = buyOrderService.queryRefundItemCount(s, e);
+		
+		List<IncomeBean> beans   = buyOrderService.toIncomeBeans(items, format);
+		
+		PageBean pageBean 		 = new PageBean();
+		pageBean.setList(beans);
+		pageBean.setTotalCount(count);
+		
+		return new ControllerResult(pageBean);
 	}
 	}
 }
 }

+ 3 - 0
shop/src/main/java/com/zskk/shop/dao/BuyOrderMapper.java

@@ -38,4 +38,7 @@ public interface BuyOrderMapper {
 	
 	
 	List<BuyOrderItem> queryPayedOrderItems(@Param("stime") Integer stime, @Param("etime") Integer etime, @Param("start") Integer start, @Param("pageSize") Integer pageSize);
 	List<BuyOrderItem> queryPayedOrderItems(@Param("stime") Integer stime, @Param("etime") Integer etime, @Param("start") Integer start, @Param("pageSize") Integer pageSize);
 	Integer queryPayedOrderItemCount(@Param("stime") Integer stime, @Param("etime") Integer etime);
 	Integer queryPayedOrderItemCount(@Param("stime") Integer stime, @Param("etime") Integer etime);
+	
+	List<BuyOrderItem> queryRefundItems(@Param("stime") Integer stime, @Param("etime") Integer etime, @Param("start") Integer start, @Param("pageSize") Integer pageSize);
+	Integer queryRefundItemCount(@Param("stime") Integer stime, @Param("etime") Integer etime);
 }
 }

+ 24 - 0
shop/src/main/java/com/zskk/shop/service/BuyOrderService.java

@@ -346,6 +346,30 @@ public class BuyOrderService {
 		return buyOrderMapper.queryPayedOrderItemCount(stime, etime);
 		return buyOrderMapper.queryPayedOrderItemCount(stime, etime);
 	}
 	}
 	
 	
+	/**
+	 * 查询退款单
+	 * @param stime
+	 * @param etime
+	 * @param page
+	 * @param pageSize
+	 * @return
+	 */
+	public List<BuyOrderItem> queryRefundItems(Integer stime, Integer etime, Integer page, Integer pageSize){
+		return buyOrderMapper.queryRefundItems(stime, etime, (page-1) * pageSize, pageSize);
+	}
+	
+	/**
+	 * 查询退款单数量
+	 * @param stime
+	 * @param etime
+	 * @param page
+	 * @param pageSize
+	 * @return
+	 */
+	public Integer queryRefundItemCount(Integer stime, Integer etime){
+		return buyOrderMapper.queryRefundItemCount(stime, etime);
+	}
+	
 	public List<IncomeBean> toIncomeBeans(List<BuyOrderItem> items, SimpleDateFormat format){
 	public List<IncomeBean> toIncomeBeans(List<BuyOrderItem> items, SimpleDateFormat format){
 		List<IncomeBean> beans = new ArrayList<>(items.size());
 		List<IncomeBean> beans = new ArrayList<>(items.size());
 		for (BuyOrderItem item: items){
 		for (BuyOrderItem item: items){

+ 27 - 1
shop/src/main/resource/mapper/BuyOrderMapper.xml

@@ -48,7 +48,8 @@
 	</update>
 	</update>
 	
 	
 	<sql id="items">
 	<sql id="items">
-		id, bid, gid, num, price, total_price as totalPrice, ctime, is_refund as isRefund, refundid, refund_time as refundTime
+		id, bid, gid, num, price, total_price as totalPrice, ctime, is_refund as isRefund, 
+		refundid, refund_time as refundTime
 	</sql>
 	</sql>
 	<select id="queryItems" resultType="com.zskk.shop.dao.entry.BuyOrderItem">
 	<select id="queryItems" resultType="com.zskk.shop.dao.entry.BuyOrderItem">
 		select <include refid="items"></include>
 		select <include refid="items"></include>
@@ -106,4 +107,29 @@
 			and bo.ptime <![CDATA[<=]]> #{etime}
 			and bo.ptime <![CDATA[<=]]> #{etime}
 		</if>
 		</if>
 	</select>
 	</select>
+	
+	<select id="queryRefundItems" resultType="com.zskk.shop.dao.entry.BuyOrderItem">
+		select <include refid="items"></include>
+		from buy_order_item
+		where is_refund=1
+		<if test="stime != null">
+			and refund_time <![CDATA[>=]]> #{stime}
+		</if>
+		<if test="etime != null">
+			and refund_time <![CDATA[<=]]> #{etime}
+		</if>
+		order by refund_time desc
+		limit #{start},#{pageSize}
+	</select>
+	<select id="queryRefundItemCount" resultType="java.lang.Integer">
+		select count(id) as totalCount
+		from buy_order_item
+		where is_refund=1
+		<if test="stime != null">
+			and refund_time <![CDATA[>=]]> #{stime}
+		</if>
+		<if test="etime != null">
+			and refund_time <![CDATA[<=]]> #{etime}
+		</if>
+	</select>
 </mapper>
 </mapper>