feats

src/main/java/com/yunzhi/niucai/controller/TaOrderController.java

@@ -55,6 +55,8 @@ public class TaOrderController extends BaseController {
     @ApiOperation(value="商铺订单列表", notes = "商铺订单列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taOrderList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                     @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @ApiParam("是否待出票") @RequestParam(value ="isDrawn", required = false) Boolean isDrawn,
+                                    @ApiParam("是否待派奖") @RequestParam(value ="isCashed", required = false) Boolean isCashed,
                                     @ApiParam("彩种类型, 不传就是所有") @RequestParam(value ="lotteryId",defaultValue = "") String lotteryId,
                                     HttpServletRequest request
                                     ) throws Exception{
@@ -62,7 +64,7 @@ public class TaOrderController extends BaseController {
         TaShop taShop = iTaShopService.getProfileBy(taShopkeeper);
 
         IPage<TaOrder> pg = new Page<>(pageNum, pageSize);
-        IPage<TaOrder> result = iTaOrderService.getShopOrders(pg, taShop, lotteryId);
+        IPage<TaOrder> result = iTaOrderService.getShopOrders(pg, taShop, lotteryId, isDrawn, isCashed);
         return ResponseBean.success(result);
     }
 //

src/main/java/com/yunzhi/niucai/mapper/TaOrderMapper.java

@@ -3,7 +3,6 @@ package com.yunzhi.niucai.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.niucai.entity.TaOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yunzhi.niucai.entity.TaShop;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -24,7 +23,11 @@ public interface TaOrderMapper extends BaseMapper<TaOrder> {
 
     IPage<TaOrder> getShopOrders(IPage<TaOrder> pg, @Param("shopId") Integer shopId) throws Exception;
 
-    IPage<TaOrder> getShopOrdersWithLottery(IPage<TaOrder> pg, @Param("shopId") Integer shopId, @Param("lotteryId") String lotteryId) throws Exception;
+    IPage<TaOrder> getShopOrdersWithLottery(IPage<TaOrder> pg,
+                                            @Param("shopId") Integer shopId,
+                                            @Param("lotteryId") String lotteryId,
+                                            @Param("isDrawn") Boolean isDrawn,
+                                            @Param("isCashed") Boolean isCashed) throws Exception;
 
     TaOrder getShopOrder(@Param("shopId") Integer shopId, @Param("orderId") String orderId) throws Exception;
 

src/main/java/com/yunzhi/niucai/service/ITaOrderService.java

@@ -21,7 +21,7 @@ public interface ITaOrderService extends IService<TaOrder> {
 
     TaOrder bettingOrder(TaBettingPlan taBettingPlan, TaCustomerBetting taCustomerBetting) throws Exception;
 
-    IPage<TaOrder> getShopOrders(IPage<TaOrder> pg, TaShop taShop, String lotteryId) throws Exception;
+    IPage<TaOrder> getShopOrders(IPage<TaOrder> pg, TaShop taShop, String lotteryId, Boolean isDrawn, Boolean isCashed) throws Exception;
 
     TaOrder getShopOrderDetail(TaShop taShop, String orderId) throws Exception;
 

src/main/java/com/yunzhi/niucai/service/impl/TaOrderServiceImpl.java

@@ -72,17 +72,17 @@ public class TaOrderServiceImpl extends ServiceImpl<TaOrderMapper, TaOrder> impl
     }
 
     @Override
-    public IPage<TaOrder> getShopOrders(IPage<TaOrder> pg, TaShop taShop, String lotteryId) throws Exception {
+    public IPage<TaOrder> getShopOrders(IPage<TaOrder> pg, TaShop taShop, String lotteryId, Boolean isDrawn, Boolean isCashed) throws Exception {
         if (taShop == null) {
             return null;
         }
 
-        IPage<TaOrder> result = null;
-        if (StringUtils.isEmpty(lotteryId)) {
-            result = taOrderMapper.getShopOrders(pg, taShop.getShopId());
-        } else {
-            result = taOrderMapper.getShopOrdersWithLottery(pg, taShop.getShopId(), lotteryId);
-        }
+        IPage<TaOrder> result = taOrderMapper.getShopOrdersWithLottery(pg, taShop.getShopId(), lotteryId, isDrawn, isCashed);
+//        if (StringUtils.isEmpty(lotteryId)) {
+//            result = taOrderMapper.getShopOrders(pg, taShop.getShopId(), isDrawn, isCashed);
+//        } else {
+//            result = taOrderMapper.getShopOrdersWithLottery(pg, taShop.getShopId(), lotteryId, isDrawn, isCashed);
+//        }
 
         // 带上投注信息
         if (null != result.getRecords() && result.getRecords().size() > 0) {

src/main/resources/application-dev.yml

@@ -22,10 +22,10 @@ logging:
 
 aliPay:
   appid: 2016102600762812
-  private-key: E:/work/niucai/app-service/cert/rsa-private.txt
-  cert-path: E:/work/niucai/app-service/cert/appCertPublicKey_2016102600762812.crt
-  public-cert-path: E:/work/niucai/app-service/cert/alipayCertPublicKey_RSA2.crt
-  root-cert-path: E:/work/niucai/app-service/cert/alipayRootCert.crt
+  private-key: D:/work/niucai/app-service/cert/rsa-private.txt
+  cert-path: D:/work/niucai/app-service/cert/appCertPublicKey_2016102600762812.crt
+  public-cert-path: D:/work/niucai/app-service/cert/alipayCertPublicKey_RSA2.crt
+  root-cert-path: D:/work/niucai/app-service/cert/alipayRootCert.crt
   api-url: https://openapi.alipay.com/gateway.do
   notify-url: http://127.0.0.1:8080/api/app/callback/alipay/pay
   auth-url: https://openauth.alipay.com/oauth2/appToAppBatchAuth.htm

src/main/resources/mapper/TaOrderMapper.xml

@@ -21,7 +21,16 @@
         INNER JOIN ta_customer_betting s ON t.betting_id = s.betting_id
         WHERE
             t.shop_id = #{shopId}
-            AND s.lottery_id = #{lotteryId}
+            AND t.order_type = 'buy-lottery'
+            <if test="null != lotteryId and lotteryId != ''">
+                AND s.lottery_id = #{lotteryId}
+            </if>
+            <if test="null != isDrawn and isDrawn == false">
+                AND s.is_drawn = 0
+            </if>
+            <if test="null != isCashed and isCashed == false">
+                AND s.is_cashed = 0
+            </if>
             AND t.`status` &gt; 0
             AND s.`status` &gt; -1
         ORDER BY