退款

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

@@ -33,9 +33,9 @@ public class ApiController {
 	private BuyOrderService buyOrderService;
 	
 	@RequestMapping("/refund")
-	public ControllerResult refund(@RequestParam("extend") String extend){
-		//JSONObject obj = JSON.parseObject(extend);
-		//buyOrderService.refund(Long.parseLong(extend));
+	@ResponseBody
+	public ControllerResult refund(@RequestParam("id") Long id){
+		buyOrderService.refund(id);
 		return new ControllerResult(Boolean.TRUE);
 	}
 	
@@ -71,6 +71,7 @@ public class ApiController {
 	}
 	
 	@RequestMapping("refundOrders")
+	@ResponseBody
 	public ControllerResult refundOrders(@RequestParam("stime") String stime, @RequestParam("etime") String etime, 
 			@RequestParam("page") Integer page, @RequestParam("pageSize") Integer pageSize, @RequestParam(name="search",required=false) String search){
 		Integer s = null;

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

@@ -24,6 +24,7 @@ import com.alibaba.druid.util.FnvHash;
 import com.zskk.shop.controller.bean.BuyOrderBean;
 import com.zskk.shop.controller.bean.BuyOrderItemBean;
 import com.zskk.shop.controller.bean.BuyUserBean;
+import com.zskk.shop.controller.bean.ControllerResult;
 import com.zskk.shop.controller.bean.FamilyPeopleBean;
 import com.zskk.shop.controller.bean.IncomeBean;
 import com.zskk.shop.dao.BuyOrderMapper;
@@ -33,6 +34,7 @@ import com.zskk.shop.dao.entry.FamilyPeopleAppointment;
 import com.zskk.shop.dao.entry.GoodBase;
 import com.zskk.shop.dao.entry.GoodPrice;
 import com.zskk.shop.exception.ErrorConstant;
+import com.zskk.shop.exception.ZSKKError;
 import com.zskk.shop.exception.ZSKKException;
 import com.zskk.shop.utils.LogUtil;
 import com.zskk.shop.utils.ToolsUtil;
@@ -269,7 +271,10 @@ public class BuyOrderService {
 		}
 		
 		String refundid = order.getOrderid() + "_" + item.getId();
-		userCenterService.refund(order, item, refundid);
+		ControllerResult ucResult = userCenterService.refund(order, item, refundid);
+		if (ucResult.getCode() != 0){
+			throw new ZSKKException(new ZSKKError(ucResult.getCode(), ucResult.getMsg()));
+		}
 		
 		item.setIsRefund(1);
 		item.setRefundid(refundid);

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

@@ -77,10 +77,10 @@
 		where orderid=#{orderid}
 	</select>
 	
-	<select id="setItemRefund" parameterType="com.zskk.shop.dao.entry.BuyOrderItem">
+	<update id="setItemRefund" parameterType="com.zskk.shop.dao.entry.BuyOrderItem">
 		update buy_order_item set is_refund=#{isRefund}, refundid=#{refundid}, refund_time=#{refundTime}
 		where id=#{id}
-	</select>
+	</update>
 
 	<select id="queryPayedOrderItems" resultType="com.zskk.shop.dao.entry.BuyOrderItem">
 		select boi.id, boi.bid, boi.gid, boi.num, boi.price, boi.total_price as totalPrice, boi.ctime,
@@ -121,27 +121,41 @@
 	</select>
 	
 	<select id="queryRefundItems" resultType="com.zskk.shop.dao.entry.BuyOrderItem">
-		select <include refid="items"></include>
-		from buy_order_item
-		where is_refund=1
+		select boi.id, boi.bid, boi.gid, boi.num, boi.price, boi.total_price as totalPrice, boi.ctime,
+			boi.is_refund as isRefund, boi.refundid, boi.refund_time as refundTime
+		from buy_order_item boi join buy_order bo on boi.bid=bo.id
+		where boi.is_refund=1
 		<if test="stime != null">
-			and refund_time <![CDATA[>=]]> #{stime}
+			and boi.refund_time <![CDATA[>=]]> #{stime}
 		</if>
 		<if test="etime != null">
-			and refund_time <![CDATA[<=]]> #{etime}
+			and boi.refund_time <![CDATA[<=]]> #{etime}
 		</if>
-		order by refund_time desc
+		<if test="search != null">
+			and (
+				bo.uphone like CONCAT('%', #{search}, '%')
+				or bo.uname like CONCAT('%', #{search}, '%')
+			)
+		</if>
+		order by boi.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
+		select boi.id, boi.bid, boi.gid, boi.num, boi.price, boi.total_price as totalPrice, boi.ctime,
+			boi.is_refund as isRefund, boi.refundid, boi.refund_time as refundTime
+		from buy_order_item boi join buy_order bo on boi.bid=bo.id
+		where boi.is_refund=1
 		<if test="stime != null">
-			and refund_time <![CDATA[>=]]> #{stime}
+			and boi.refund_time <![CDATA[>=]]> #{stime}
 		</if>
 		<if test="etime != null">
-			and refund_time <![CDATA[<=]]> #{etime}
+			and boi.refund_time <![CDATA[<=]]> #{etime}
+		</if>
+		<if test="search != null">
+			and (
+				bo.uphone like CONCAT('%', #{search}, '%')
+				or bo.uname like CONCAT('%', #{search}, '%')
+			)
 		</if>
 	</select>
 </mapper>