结算功能修改

alien-entity/src/main/java/shop/alien/mapper/ManagementInfoMapper.java

@@ -34,7 +34,7 @@ public interface ManagementInfoMapper {
 
     IPage<ManagementInfoVo> getApplicationForWithdrawal(IPage<ManagementInfoVo> iPage, @Param("storeId") Integer storeId, @Param("storeName") String storeName);
 
-    IPage<ManagementInfoVo> getStoreOrderDetail(IPage<ManagementInfoVo> iPage, @Param("storeId") String storeId);
+    IPage<ManagementInfoVo> getStoreOrderDetail(IPage<ManagementInfoVo> iPage, @Param("storeId") String storeId, @Param("orderNo") String orderNo, @Param("userId") String userId, @Param("userName") String userName);
 
     //获取平台净利润
     ManagementInfoVo getPlatformNetProfit(@Param("dataTime") String dataTime);

alien-entity/src/main/resources/mapper/ManagementInfoMapper.xml

@@ -176,6 +176,15 @@
                 LEFT JOIN life_user userInfo ON userOrder.user_id = userInfo.id
         WHERE
             userOrder.store_id = #{storeId}
+        <if test = "orderNo != null and orderNo != ''" >
+            AND userOrder.order_no = #{orderNo}
+        </if >
+        <if test = "userId != null and userId != ''" >
+            AND userOrder.user_id = #{userId}
+        </if >
+        <if test = "userName != null and userName != ''" >
+            AND userInfo.user_name like concat('%',#{userName},'%')
+        </if >
     </select>
     <select id="getUserCount" resultType="shop.alien.entity.store.vo.ManagementInfoVo">
         SELECT

alien-store/src/main/java/shop/alien/store/controller/ManagementInfoController.java

@@ -58,8 +58,11 @@ public class ManagementInfoController {
     public R<IPage<ManagementInfoVo>> getStoreOrderDetail(
             @RequestParam(value = "page", defaultValue = "1") int page,
             @RequestParam(value = "size", defaultValue = "10") int size,
-            @RequestParam(value = "storeId", required = false) String storeId) {
-        return R.data(managementInfoService.getStoreOrderDetail(page, size, storeId));
+            @RequestParam(value = "storeId", required = false) String storeId,
+            @RequestParam(value = "orderNo", required = false) String orderNo,
+            @RequestParam(value = "userId", required = false) String userId,
+            @RequestParam(value = "userName", required = false) String userName) {
+        return R.data(managementInfoService.getStoreOrderDetail(page, size, storeId, orderNo, userId, userName));
     }
 
     @ApiOperation("店铺详情账单统计")

alien-store/src/main/java/shop/alien/store/service/ManagementInfoService.java

@@ -22,7 +22,7 @@ public interface ManagementInfoService {
     /**
      * 获取店铺订单详情，根据id
      */
-    IPage<ManagementInfoVo> getStoreOrderDetail(int pageNo, int pageSize, String storeId);
+    IPage<ManagementInfoVo> getStoreOrderDetail(int pageNo, int pageSize, String storeId, String orderNo, String userId, String userName);
 
     /**
      * 获取提现申请列表

alien-store/src/main/java/shop/alien/store/service/impl/ManagementInfoServiceImpl.java

@@ -165,9 +165,9 @@ public class ManagementInfoServiceImpl implements ManagementInfoService {
     }
 
     @Override
-    public IPage<ManagementInfoVo> getStoreOrderDetail(int pageNo, int pageSize, String storeId) {
+    public IPage<ManagementInfoVo> getStoreOrderDetail(int pageNo, int pageSize, String storeId, String orderNo, String userId, String userName) {
         IPage<ManagementInfoVo> iPage = new Page<>(pageNo, pageSize);
-        IPage<ManagementInfoVo> storeOrderDetail = managementInfoMapper.getStoreOrderDetail(iPage, storeId);
+        IPage<ManagementInfoVo> storeOrderDetail = managementInfoMapper.getStoreOrderDetail(iPage, storeId, orderNo, userId, userName);
         return storeOrderDetail;
     }