订单查询接口

shop/src/main/java/com/zskk/shop/controller/api/ApiController.java

@@ -13,6 +13,7 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -41,10 +42,13 @@ public class ApiController {
 	@RequestMapping("/orders")
 	@ResponseBody
 	public ControllerResult orders(@RequestParam("stime") String stime, @RequestParam("etime") String etime, 
-			@RequestParam("page") Integer page, @RequestParam("pageSize") Integer pageSize){
+			@RequestParam("page") Integer page, @RequestParam("pageSize") Integer pageSize, @RequestParam(name="search",required=false) String search){
 		
 		Integer s = null;
 		Integer e = null;
+		if (search != null && search.isEmpty()){
+			search = null;
+		}
 		
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		try{
@@ -54,8 +58,8 @@ public class ApiController {
 			return new ControllerResult(ErrorConstant.PARAM_ERROR);
 		}
 		
-		List<BuyOrderItem> items = buyOrderService.queryPayedOrderItems(s, e, page, pageSize);
-		Integer count			 = buyOrderService.queryPayedOrderItemCount(s, e);
+		List<BuyOrderItem> items = buyOrderService.queryPayedOrderItems(s, e, page, pageSize, search);
+		Integer count			 = buyOrderService.queryPayedOrderItemCount(s, e, search);
 		
 		List<IncomeBean> beans   = buyOrderService.toIncomeBeans(items, format);
 		
@@ -68,9 +72,12 @@ public class ApiController {
 	
 	@RequestMapping("refundOrders")
 	public ControllerResult refundOrders(@RequestParam("stime") String stime, @RequestParam("etime") String etime, 
-			@RequestParam("page") Integer page, @RequestParam("pageSize") Integer pageSize){
+			@RequestParam("page") Integer page, @RequestParam("pageSize") Integer pageSize, @RequestParam(name="search",required=false) String search){
 		Integer s = null;
 		Integer e = null;
+		if (search != null && search.isEmpty()){
+			search = null;
+		}
 		
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		try{
@@ -80,8 +87,8 @@ public class ApiController {
 			return new ControllerResult(ErrorConstant.PARAM_ERROR);
 		}
 		
-		List<BuyOrderItem> items = buyOrderService.queryRefundItems(s, e, page, pageSize);
-		Integer count			 = buyOrderService.queryRefundItemCount(s, e);
+		List<BuyOrderItem> items = buyOrderService.queryRefundItems(s, e, page, pageSize, search);
+		Integer count			 = buyOrderService.queryRefundItemCount(s, e, search);
 		
 		List<IncomeBean> beans   = buyOrderService.toIncomeBeans(items, format);
 		

shop/src/main/java/com/zskk/shop/controller/bean/IncomeBean.java

@@ -20,6 +20,8 @@ public class IncomeBean {
 	private String refundTime;
 	private BuyUserBean buyUser;
 	private FamilyPeopleBean appointmentUser;
+	private Integer status;
+	
 	public Long getId() {
 		return id;
 	}
@@ -86,4 +88,10 @@ public class IncomeBean {
 	public void setRefundTime(String refundTime) {
 		this.refundTime = refundTime;
 	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
 }

shop/src/main/java/com/zskk/shop/dao/BuyOrderMapper.java

@@ -36,9 +36,10 @@ public interface BuyOrderMapper {
 	
 	public int setItemRefund(BuyOrderItem item);
 	
-	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);
+	List<BuyOrderItem> queryPayedOrderItems(@Param("stime") Integer stime, @Param("etime") Integer etime, @Param("start") Integer start, 
+			@Param("pageSize") Integer pageSize, @Param("search") String search);
+	Integer queryPayedOrderItemCount(@Param("stime") Integer stime, @Param("etime") Integer etime, @Param("search") String search);
 	
-	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);
+	List<BuyOrderItem> queryRefundItems(@Param("stime") Integer stime, @Param("etime") Integer etime, @Param("start") Integer start, @Param("pageSize") Integer pageSize, @Param("search") String search);
+	Integer queryRefundItemCount(@Param("stime") Integer stime, @Param("etime") Integer etime, @Param("search") String search);
 }

shop/src/main/java/com/zskk/shop/service/BuyOrderService.java

@@ -59,6 +59,26 @@ public class BuyOrderService {
 	 */
 	public static final Integer DEL_STATUS_YES = 1;
 	
+	/**
+	 * 订单状态 已退款
+	 */
+	public static final Integer ORDER_STATUS_REFUND = 1;
+	
+	/**
+	 * 订单状态 已使用
+	 */
+	public static final Integer ORDER_STATUS_USED = 2;
+	
+	/**
+	 * 订单状态 已预约
+	 */
+	public static final Integer ORDER_STATUS_APPOINTMENT = 3;
+	
+	/**
+	 * 订单状态 未预约
+	 */
+	public static final Integer ORDER_STATUS_NOAPPOINTMENT = 4;
+	
 	@Autowired
 	private BuyOrderMapper buyOrderMapper;
 	
@@ -328,10 +348,11 @@ public class BuyOrderService {
 	 * @param etime
 	 * @param page
 	 * @param pageSize
+	 * @param search
 	 * @return
 	 */
-	public List<BuyOrderItem> queryPayedOrderItems(Integer stime, Integer etime, Integer page, Integer pageSize){
-		return buyOrderMapper.queryPayedOrderItems(stime, etime, (page-1) * pageSize, pageSize);
+	public List<BuyOrderItem> queryPayedOrderItems(Integer stime, Integer etime, Integer page, Integer pageSize, String search){
+		return buyOrderMapper.queryPayedOrderItems(stime, etime, (page-1) * pageSize, pageSize, search);
 	}
 	
 	/**
@@ -342,8 +363,8 @@ public class BuyOrderService {
 	 * @param pageSize
 	 * @return
 	 */
-	public Integer queryPayedOrderItemCount(Integer stime, Integer etime){
-		return buyOrderMapper.queryPayedOrderItemCount(stime, etime);
+	public Integer queryPayedOrderItemCount(Integer stime, Integer etime, String search){
+		return buyOrderMapper.queryPayedOrderItemCount(stime, etime, search);
 	}
 	
 	/**
@@ -354,8 +375,8 @@ public class BuyOrderService {
 	 * @param pageSize
 	 * @return
 	 */
-	public List<BuyOrderItem> queryRefundItems(Integer stime, Integer etime, Integer page, Integer pageSize){
-		return buyOrderMapper.queryRefundItems(stime, etime, (page-1) * pageSize, pageSize);
+	public List<BuyOrderItem> queryRefundItems(Integer stime, Integer etime, Integer page, Integer pageSize, String search){
+		return buyOrderMapper.queryRefundItems(stime, etime, (page-1) * pageSize, pageSize, search);
 	}
 	
 	/**
@@ -366,8 +387,8 @@ public class BuyOrderService {
 	 * @param pageSize
 	 * @return
 	 */
-	public Integer queryRefundItemCount(Integer stime, Integer etime){
-		return buyOrderMapper.queryRefundItemCount(stime, etime);
+	public Integer queryRefundItemCount(Integer stime, Integer etime, String search){
+		return buyOrderMapper.queryRefundItemCount(stime, etime, search);
 	}
 	
 	public List<IncomeBean> toIncomeBeans(List<BuyOrderItem> items, SimpleDateFormat format){
@@ -419,6 +440,20 @@ public class BuyOrderService {
 			bean.setAppointmentUser(fbean);
 		}
 		
+		if (item.getIsRefund().equals(1)){
+			bean.setStatus(ORDER_STATUS_REFUND);
+		}else{
+			if (familyPeople != null){
+				if (familyPeople.getTjstatus() >= 0){
+					bean.setStatus(ORDER_STATUS_USED);
+				}else{
+					bean.setStatus(ORDER_STATUS_APPOINTMENT);
+				}
+			}else{
+				bean.setStatus(ORDER_STATUS_NOAPPOINTMENT);
+			}
+		}
+		
 		return bean;
 	}
 	

shop/src/main/resource/mapper/BuyOrderMapper.xml

@@ -93,6 +93,12 @@
 		<if test="etime != null">
 			and bo.ptime <![CDATA[<=]]> #{etime}
 		</if>
+		<if test="search != null">
+			and (
+				bo.uphone like CONCAT('%', #{search}, '%')
+				or bo.uname like CONCAT('%', #{search}, '%')
+			)
+		</if>
 		order by bo.ptime desc
 		limit #{start},#{pageSize}
 	</select>
@@ -106,6 +112,12 @@
 		<if test="etime != null">
 			and bo.ptime <![CDATA[<=]]> #{etime}
 		</if>
+		<if test="search != null">
+			and (
+				bo.uphone like CONCAT('%', #{search}, '%')
+				or bo.uname like CONCAT('%', #{search}, '%')
+			)
+		</if>
 	</select>
 	
 	<select id="queryRefundItems" resultType="com.zskk.shop.dao.entry.BuyOrderItem">

shop/src/main/resource/mapper/ShopConfigMapper.xml

@@ -5,7 +5,7 @@
 		insert into shop_config(key, description, value, ctime)
 		values(#{key}, #{description}, #{value}, #{ctime})
 	</insert>
-	<update id="update" parameterMap="com.zskk.shop.dao.entry.ShopConfig">
+	<update id="update" parameterType="com.zskk.shop.dao.entry.ShopConfig">
 		update shop_config description=#{description}, value=#{description}
 		where key=#{key}
 	</update>