diff --git a/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java index b68624fc..af04ef5d 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java @@ -12,6 +12,7 @@ import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; import com.hai.common.pay.util.XmlUtil; import com.hai.common.pay.util.sdk.WXPayConstants; +import com.hai.common.security.SessionObject; import com.hai.common.security.UserCenter; import com.hai.common.utils.DateUtil; import com.hai.common.utils.IDGenerator; @@ -22,6 +23,7 @@ import com.hai.model.HighOrderModel; import com.hai.model.OutRechargeOrderModel; import com.hai.model.OrderRefundModel; import com.hai.model.ResponseData; +import com.hai.model.UserInfoModel; import com.hai.service.OutRechargeOrderService; import com.hai.service.TelApiService; import com.hai.service.pay.impl.GoodsOrderServiceImpl; @@ -180,7 +182,6 @@ public class OutRechargeOrderController { } } - @RequestMapping(value = "/exportOrderList", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "导出订单") @@ -298,4 +299,39 @@ public class OutRechargeOrderController { httpClient.close(); } } + + @RequestMapping(value = "/getOrderCountList", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询商品") + public ResponseData getOrderCountList( + @RequestParam(name = "finishTimeS", required = false) Long finishTimeS, + @RequestParam(name = "finishTimeE", required = false) Long finishTimeE, + @RequestParam(name = "pageNum", required = true) Integer pageNum, + @RequestParam(name = "pageSize", required = true) Integer pageSize, + HttpServletRequest request) { + try { + + Map map = new HashMap<>(); + + if (finishTimeS != null){ + map.put("finishTimeS", finishTimeS.toString()); + } else { + map.put("finishTimeS", null); + } + + if (finishTimeE != null){ + map.put("finishTimeE", finishTimeE.toString()); + } else { + map.put("finishTimeE", null); + } + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(outRechargeOrderService.getListOrderCount(map))); + + } catch (Exception e) { + log.error("HighOrderController --> getUserOrderList() error!", e); + return ResponseMsgUtil.exception(e); + } + } + } diff --git a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java index f204e625..9ae2cf22 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java @@ -1,8 +1,14 @@ package com.hai.dao; + +import com.hai.model.OutOrderModel; import com.hai.model.OutRechargeOrderModel; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.type.JdbcType; + import java.util.List; import java.util.Map; @@ -11,6 +17,27 @@ import java.util.Map; * mapper扩展类 */ public interface OutRechargeOrderMapperExt { + + @Select(value = { + "" + }) + @Results({ + @Result(column="count", property="count", jdbcType=JdbcType.BIGINT), + @Result(column="day", property="day", jdbcType=JdbcType.TIMESTAMP), + @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL), + }) + List getListOrderCount(@Param("map") Map map); @Select({"