Merge remote-tracking branch 'origin/bjcz_his_scrm' into bjcz_his_scrm

fs-service/src/main/java/com/fs/hisStore/param/FsStoreScanPaymentStatParam.java

@@ -15,8 +15,8 @@ public class FsStoreScanPaymentStatParam extends BaseQueryParam implements Seria
     /**
      * 销售ID
      */
-    @NotNull(message = "操作失败，销售信息不能为空！")
-    private Long companyUserId;
+    @NotNull(message = "操作失败，销售公司信息不能为空！")
+    private Long companyId;
 
     /**
      * 统计类型 1：日统计 2：月统计 3：年统计

fs-service/src/main/resources/mapper/hisStore/FsStorePaymentScrmMapper.xml

@@ -144,8 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderId != null">order_id = #{orderId},</if>
             <if test="isPayRemain != null">is_pay_remain = #{isPayRemain},</if>
             <if test="payMode != null">pay_mode = #{payMode},</if>
-            <if test="originalAmount != null">#{originalAmount},</if>
-            <if test="reductionAmount != null">#{reductionAmount},</if>
+            <if test="originalAmount != null">original_amount=#{originalAmount},</if>
+            <if test="reductionAmount != null">reduction_amount=#{reductionAmount},</if>
         </trim>
         where payment_id = #{paymentId}
     </update>
@@ -208,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             business_type = 1
           AND `status` = 1
-          AND company_user_id = #{dayParam.companyUserId}
+          AND company_id = #{dayParam.companyId}
         AND pay_time >= DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00')
         AND pay_time &lt; DATE_FORMAT(
         DATE_ADD(NOW(), INTERVAL 1 DAY),
@@ -229,7 +229,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         business_type = 1
         AND `status` = 1
-          AND company_user_id = #{dayParam.companyUserId}
+          AND company_id = #{dayParam.companyId}
         AND pay_time >= DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00')
         AND pay_time &lt; DATE_FORMAT(
         DATE_ADD(NOW(), INTERVAL 1 DAY),
@@ -248,7 +248,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             business_type = 1
         AND `status` = 1
-        AND company_user_id = #{monthParam.companyUserId}
+        AND company_id = #{monthParam.companyId}
         AND pay_time >= DATE_FORMAT(NOW(), '%Y-%m-01 00:00:00')
         AND pay_time &lt; DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 MONTH), '%Y-%m-01 00:00:00')
         GROUP BY
@@ -266,7 +266,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         business_type = 1
         AND `status` = 1
-        AND company_user_id = #{monthParam.companyUserId}
+        AND company_id = #{monthParam.companyId}
         AND pay_time >= DATE_FORMAT(NOW(), '%Y-%m-01 00:00:00')
         AND pay_time &lt; DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 MONTH), '%Y-%m-01 00:00:00')
         ORDER BY
@@ -283,7 +283,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         business_type = 1
         AND `status` = 1
-        AND company_user_id = #{yearParam.companyUserId}
+        AND company_id = #{yearParam.companyId}
         AND pay_time >= DATE_FORMAT(NOW(), '%Y-01-01 00:00:00')
         AND pay_time &lt; DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 YEAR), '%Y-01-01 00:00:00')
         GROUP BY
@@ -301,7 +301,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             business_type = 1
           AND `status` = 1
-          AND company_user_id = #{yearParam.companyUserId}
+          AND company_id = #{yearParam.companyId}
           AND pay_time >= DATE_FORMAT(NOW(), '%Y-01-01 00:00:00')
           AND pay_time &lt; DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 YEAR), '%Y-01-01 00:00:00')
         ORDER BY
@@ -318,7 +318,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             business_type = 1
           AND `status` = 1
-          AND company_user_id = #{dateParam.companyUserId}
+          AND company_id = #{dateParam.companyId}
           AND pay_time >= CONCAT(#{dateParam.startDate}, ' 00:00:00')
           AND pay_time &lt;= CONCAT(#{dateParam.endDate}, ' 23:59:59')
     </select>
@@ -334,7 +334,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             business_type = 1
           AND `status` = 1
-          AND company_user_id = #{dateParam.companyUserId}
+          AND company_id = #{dateParam.companyId}
           AND pay_time >= CONCAT(#{dateParam.startDate}, ' 00:00:00')
           AND pay_time &lt;= CONCAT(#{dateParam.endDate}, ' 23:59:59')
         ORDER BY

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

@@ -77,7 +77,7 @@ public class FsStoreScanPaymentStatController extends AppBaseController {
     @PostMapping("/getScanPayStatPage")
     public R getScanPayStatPage(@Valid @RequestBody FsStoreScanPaymentStatParam param) {
         //分页
-        PageHelper.startPage(param.getPage(), param.getPageSize());
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         List<FsStoreScanPaymentStatDetailsVo> statDetailsVos=paymentService.getScanPaymentStatPage(param);
         PageInfo<FsStoreScanPaymentStatDetailsVo> listPageInfo=new PageInfo<>(statDetailsVos);
         return R.ok().put("data",listPageInfo);