20220902

xiaoyong931011

2022-09-19 7baa365aa6f6c9d6aa56fad893515d2d524f9373

20220902

 src/main/java/cc/mrbird/febs/mall/mapper/MallTeamLeaderMapper.java

@@ -34,4 +34,6 @@
    MallTeamLeader selectLeaderByUniqueCodeAndOrderBycreateTime(@Param("uniqueCode")String inviteId);

    MallTeamLeader selectByFenceIdAndFenceNameAndLonAndLat(@Param("longitude")Double longitude, @Param("latitude")Double latitude,@Param("fenceId")String gfid, @Param("fenceName")String gfname);

    List<MallTeamLeader> getAllMallTeamLeaderList();
}

 src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java

@@ -148,8 +148,8 @@
     * 修改业绩的状态
     * 并生成一条提成流水
     */
//    @Scheduled(cron = "0 0 1 * * ?")
    @Scheduled(cron = "1 * * * * ?")
    @Scheduled(cron = "0 0 1 * * ?")
//    @Scheduled(cron = "1 * * * * ?")
    public void leaderAchieveAuto() {
        log.info("团长每日提成");
        //获取每日提成总数
@@ -157,8 +157,8 @@
         * a.unique_code uniqueCode 团长特征码
         * , IFNULL(sum(a.amount),0) amount 每日提成总金额
         */
//            DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
        DateTime dateTime = DateUtil.offsetDay(new Date(), 0);
            DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
//        DateTime dateTime = DateUtil.offsetDay(new Date(), 0);
        List<Map<String, String>> allLeaderAchieve = mallLeaderAchieveMapper.selectListByStateAndCreateTimeAndUniqueCode(MallLeaderAchieve.STATE_ONE,dateTime);
        if (CollUtil.isNotEmpty(allLeaderAchieve)) {
            for (Map<String, String> map : allLeaderAchieve) {

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java

@@ -128,7 +128,7 @@
    @Override
    public List<AdminSelectListLeaderVo> selectList(MallTeamLeader mallTeamLeader) {
        List<AdminSelectListLeaderVo> list = new ArrayList<>();
        List<MallTeamLeader> mallTeamLeaders = this.baseMapper.getMallTeamLeaderList();
        List<MallTeamLeader> mallTeamLeaders = this.baseMapper.getAllMallTeamLeaderList();
        if(CollUtil.isNotEmpty(mallTeamLeaders)){
            for(MallTeamLeader teamLeader : mallTeamLeaders){
                AdminSelectListLeaderVo adminSelectListLeaderVo = new AdminSelectListLeaderVo();

 src/main/resources/application-dev.yml

@@ -73,5 +73,5 @@
  certLocalPath: /home/yyscCert/apiclient_cert.p12
  wecharpayMchid: 1631084809
  wecharpaySecret: YYSC13875978057YYSC13875978057SH
  gaodeKey: e024c63342930addc57189c8608cdb01
  gaodeKey: 95ede7157929f5f6b6c758971be924b1
  serviceName: yiyuanshucai

 src/main/resources/application-prod.yml

@@ -69,5 +69,5 @@
  certLocalPath: /home/yyscCert/apiclient_cert.p12
  wecharpayMchid: 1631084809
  wecharpaySecret: YYSC13875978057YYSC13875978057SH
  gaodeKey: e024c63342930addc57189c8608cdb01
  gaodeKey: 95ede7157929f5f6b6c758971be924b1
  serviceName: yiyuanshucai

 src/main/resources/application-test.yml

@@ -72,7 +72,7 @@
  wechar_login_url: https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
  xcx_appid: wx0b515f652282158e
  xcx_secret: 8d3d3c14221f7dc37650b861dc0fc570
  debug: true
  debug: false
  wecharPaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/wxpayCallback
  wecharRechargePaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/rechargeCallBack
  certLocalPath: /home/yyscCert/apiclient_cert.p12

 src/main/resources/mapper/modules/MallTeamLeaderMapper.xml

@@ -204,4 +204,11 @@
        and b.fence_name = #{fenceName}
    </select>

    <select id="getAllMallTeamLeaderList" resultType="cc.mrbird.febs.mall.entity.MallTeamLeader">
        select
            a.*
        from mall_team_leader a
        where a.state = 1
    </select>

</mapper>