Ver Fonte

扫码流水统计优化

yjwang há 1 mês atrás
pai
commit
1f9fb6dbe2

+ 14 - 6
fs-user-app/src/main/java/com/fs/app/controller/store/FsStoreScanPaymentStatController.java

@@ -7,6 +7,7 @@ import com.fs.common.core.page.TableDataInfo;
 import com.fs.hisStore.config.StoreConfig;
 import com.fs.hisStore.param.FsStoreScanPaymentStatParam;
 import com.fs.hisStore.service.IFsStorePaymentScrmService;
+import com.fs.hisStore.vo.FsArticleListQueryVO;
 import com.fs.hisStore.vo.FsStoreScanPaymentStatDetailsVo;
 import com.fs.hisStore.vo.FsStoreScanPaymentStatVo;
 import com.fs.system.service.ISysConfigService;
@@ -42,12 +43,6 @@ public class FsStoreScanPaymentStatController extends AppBaseController {
     public R getScanPayStat(@Valid @RequestBody FsStoreScanPaymentStatParam param) {
         //统计
         FsStoreScanPaymentStatVo scanPaymentStat = paymentService.getScanPaymentStat(param);
-        //分页
-        startPage();
-        List<FsStoreScanPaymentStatDetailsVo> statDetailsVos=paymentService.getScanPaymentStatPage(param);
-        if(!statDetailsVos.isEmpty()){
-            scanPaymentStat.setTableDataInfo(getDataTable(statDetailsVos));
-        }
         return R.ok().put("data",scanPaymentStat);
     }
 
@@ -75,6 +70,19 @@ public class FsStoreScanPaymentStatController extends AppBaseController {
         }
     }
 
+    /**
+     * 扫码支付分页查询接口
+     */
+    @ApiOperation("销售收款码金额统计")
+    @PostMapping("/getScanPayStatPage")
+    public R getScanPayStatPage(@Valid @RequestBody FsStoreScanPaymentStatParam param) {
+        //分页
+        PageHelper.startPage(param.getPage(), param.getPageSize());
+        List<FsStoreScanPaymentStatDetailsVo> statDetailsVos=paymentService.getScanPaymentStatPage(param);
+        PageInfo<FsStoreScanPaymentStatDetailsVo> listPageInfo=new PageInfo<>(statDetailsVos);
+        return R.ok().put("data",listPageInfo);
+    }
+
     /**
      * 验证立减配置是否有效
      * @param config 店铺配置对象