领取商品

fightwine-front/src/main/java/com/yzt/front/controller/StoreOrderController.java

@@ -82,19 +82,22 @@ public class StoreOrderController {
     /**
      * 订单列表
      * @param type 类型
+     * @param payType 支付方式
      * @param pageRequest 分页
      * @return 订单列表
      */
     @ApiOperation(value = "订单列表")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiImplicitParams ({
-        @ApiImplicitParam(name = "type", value = "评价等级|0=未支付,1=待发货,2=待收货,3=待评价,4=已完成,-3=售后/退款,-4=已取消", required = false)
+        @ApiImplicitParam(name = "type", value = "评价等级|0=未支付,1=待发货,2=待收货,3=待评价,4=已完成,-3=售后/退款,-4=已取消", required = false),
+        @ApiImplicitParam(name = "payType", value = "支付方式，free表示免费订单", required = false)
     })
     public CommonResult<CommonPage<OrderDetailResponse>> orderList(
             @RequestParam(name = "keywords", required = false) String keywords,
             @RequestParam(name = "type", required = false) Integer type,
+            @RequestParam(name = "payType", required = false) String payType,
             @ModelAttribute PageParamRequest pageRequest) {
-        return CommonResult.success(CommonPage.restPage(orderService.list(keywords, type, pageRequest)));
+        return CommonResult.success(CommonPage.restPage(orderService.list(keywords, type, payType, pageRequest)));
     }
 
     /**

fightwine-service/src/main/java/com/yzt/service/service/OrderService.java

@@ -16,10 +16,11 @@ public interface OrderService {
     /**
      * 订单列表
      * @param type 类型
+     * @param payType 支付方式
      * @param pageRequest 分页
      * @return 订单集合
      */
-    PageInfo<OrderDetailResponse> list(String keywords,Integer type, PageParamRequest pageRequest);
+    PageInfo<OrderDetailResponse> list(String keywords,Integer type, String payType, PageParamRequest pageRequest);
 
     /**
      * 订单详情

fightwine-service/src/main/java/com/yzt/service/service/StoreOrderService.java

@@ -53,7 +53,7 @@ public interface StoreOrderService extends IService<StoreOrder> {
      * @return 订单结果列表
      */
     List<StoreOrder> getUserOrderList(Integer uid, Integer status, PageParamRequest pageParamRequest);
-    PageInfo<StoreOrder> getUserOrderList_2_3(String keywords, Integer uid, Integer status, PageParamRequest pageParamRequest);
+    PageInfo<StoreOrder> getUserOrderList_2_3(String keywords, Integer uid, Integer status, String payType, PageParamRequest pageParamRequest);
     /**
      * 创建订单
      * @param storeOrder 订单参数

fightwine-service/src/main/java/com/yzt/service/service/impl/OrderServiceImpl.java

@@ -448,14 +448,15 @@ public class OrderServiceImpl implements OrderService {
      * 订单列表
      *
      * @param status      类型
+     * @param payType     支付方式
      * @param pageRequest 分页
      * @return CommonPage<OrderDetailResponse>
      */
     @Override
-    public PageInfo<OrderDetailResponse> list(String keywords, Integer status, PageParamRequest pageRequest) {
+    public PageInfo<OrderDetailResponse> list(String keywords, Integer status, String payType, PageParamRequest pageRequest) {
         Integer userId = userService.getUserIdException();
 
-        PageInfo<StoreOrder> orderPageInfo = storeOrderService.getUserOrderList_2_3(keywords,userId, status, pageRequest);
+        PageInfo<StoreOrder> orderPageInfo = storeOrderService.getUserOrderList_2_3(keywords,userId, status, payType, pageRequest);
         List<StoreOrder> orderList = orderPageInfo.getList();
         if (CollUtil.isEmpty(orderList)) {
             return CommonPage.copyPageInfo(orderPageInfo, CollUtil.newArrayList());

fightwine-service/src/main/java/com/yzt/service/service/impl/StoreOrderServiceImpl.java

@@ -198,17 +198,19 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
      * @param keywords 搜索条件
      * @param uid 用户uid
      * @param status 评价等级|0=未支付,1=待发货,2=待收货,3=待评价,4=已完成,-3=售后/退款
+     * @param payType 支付方式
      * @param pageParamRequest 分页参数
      * @return 订单结果列表
      */
     public PageInfo<StoreOrder> getUserOrderList_2_3(String keywords,
-                                                 Integer uid, Integer status, PageParamRequest pageParamRequest) {
+                                                 Integer uid, Integer status, String payType, PageParamRequest pageParamRequest) {
         Page<StoreOrder> page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
         Map<String, Object> searchMap = new HashMap<>();
         String searchKey = URLUtil.decode(keywords);
         searchMap.put("keywords", searchKey);
         searchMap.put("status", status);
         searchMap.put("uid", uid);
+        searchMap.put("payType", payType);
         List<StoreOrder> orderList = mapper.findFrontList(searchMap);
 
         return CommonPage.copyPageInfo(page, orderList);

fightwine-service/src/main/resources/mapper/store/StoreOrderMapper.xml

@@ -3,16 +3,16 @@
 <mapper namespace="com.yzt.service.mapper.StoreOrderMapper">
 
     <select id="getTotalPrice" resultType="java.math.BigDecimal">
-        select sum(pay_price) from fw_store_order where ${where} and refund_status = 0
+        select sum(pay_price) from zp_store_order where ${where} and refund_status = 0
     </select>
     <select id="getRefundPrice" resultType="java.math.BigDecimal">
-        select sum(refund_price) from fw_store_order where ${where} and refund_status = 2
+        select sum(refund_price) from zp_store_order where ${where} and refund_status = 2
     </select>
     <select id="getRefundTotal" resultType="java.lang.Integer">
-        select count(id) from fw_store_order where ${where} and refund_status = 2
+        select count(id) from zp_store_order where ${where} and refund_status = 2
     </select>
     <select id="findFrontList" resultType="com.yzt.common.model.order.StoreOrder" parameterType="Map">
-        select * from fw_store_order
+        select * from zp_store_order
         where
         uid = #{uid}
         <if test="status != null ">
@@ -72,14 +72,17 @@
         <if test="keywords != null and keywords !='' ">
             and (order_id like CONCAT('%',#{keywords},'%')
             or
-            order_id in (select order_no from fw_store_order_info where product_name like CONCAT('%',#{keywords},'%')))
+            order_id in (select order_no from zp_store_order_info where product_name like CONCAT('%',#{keywords},'%')))
+        </if>
+        <if test="payType != null and payType !='' ">
+            and pay_type = #{payType}
         </if>
         order by id desc
     </select>
     <select id="getOrderVerificationDetail" parameterType="com.yzt.common.request.PageParamRequest"
             resultType="com.yzt.common.response.StoreStaffDetail">
         select sum(o.`pay_price`) as price, count(o.`id`) as count, DATE_FORMAT(o.`create_time`, '%Y-%m-%d') as time
-        from `fw_store_order` o
+        from `zp_store_order` o
         where o.`is_del` = 0 and o.`paid` = 1 and o.`refund_status` = 0
         <if test="null != startTime and startTime != ''">
             and o.create_time >= #{ startTime }
@@ -92,7 +95,7 @@
     <select id="getOrderStatisticsPriceDetail" parameterType="com.yzt.common.request.StoreDateRangeSqlPram"
             resultType="com.yzt.common.response.StoreOrderStatisticsChartItemResponse">
         select sum(o.pay_price) as num,date_format(o.create_time, '%Y-%m-%d') as time
-        from fw_store_order o
+        from zp_store_order o
         where o.is_del >= 0 and o.paid >= 1 and o.refund_status >= 0
         and o.create_time >= #{ startTime }
         and o.create_time &lt; #{ endTime }
@@ -102,7 +105,7 @@
     <select id="getOrderStatisticsOrderCountDetail" parameterType="com.yzt.common.request.StoreDateRangeSqlPram"
             resultType="com.yzt.common.response.StoreOrderStatisticsChartItemResponse">
         select count(id) as num, date_format(o.create_time, '%Y-%m-%d') as time
-        from fw_store_order o
+        from zp_store_order o
         where o.is_del >= 0 and o.paid >= 1 and o.refund_status >= 0
         and o.create_time >= #{ startTime }
         and o.create_time &lt; #{ endTime }
@@ -112,8 +115,8 @@
 
     <select id="getBrokerageData" resultType="com.yzt.common.response.OrderBrokerageData">
         select count(*) as num, sum(o.pay_price) as price
-        from fw_store_order as o
+        from zp_store_order as o
-        right join fw_user_brokerage_record as br on br.link_id = o.order_id and br.status = 3 and br.uid = #{spreadId}
+        right join zp_user_brokerage_record as br on br.link_id = o.order_id and br.status = 3 and br.uid = #{spreadId}
         where o.uid = #{uid} and o.status > 1;
     </select>
 </mapper>