e847891c4f6f12cee5e764f8c1fad001496b9740..00a8e2f76d02cfc17ca9ff156aa97f85bae5897d
2021-08-09 Helius
Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
00a8e2 diff | tree
2021-08-09 Helius
fix
97f820 diff | tree
2021-08-09 xiaoyong931011
20210809
371065 diff | tree
2 files modified
7 ■■■■ changed files
gc-sys/src/main/resources/mapper/system/SysEnvironmentalInfoMapper.xml 2 ●●● patch | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java 5 ●●●●● patch | view | raw | blame | history
gc-sys/src/main/resources/mapper/system/SysEnvironmentalInfoMapper.xml
@@ -78,7 +78,7 @@
    <select id="queryOperaIteml" parameterType="com.xzx.gc.model.admin.ItemModel"
            resultType="com.xzx.gc.model.admin.ItemModel">
        select a.id,a.title,a.del_flag as delFlag,a.show_flag as showFlag,a.item_unit as itemUnit,
        select a.id,a.title,a.del_flag as delFlag,a.show_flag as showFlag,a.item_unit as itemUnit,a.min_price minPrice,a.max_price maxPrice,
        (select b.title from xzx_sys_environmental_info b where b.id=a.parent_id) as type,
        a.price as price,a.second_price as secondPrice,IFNULL(a.put_storage_price,0.00) as putStoragePrice,a.sort as
        sort,
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
@@ -483,6 +483,11 @@
        }
        RedPaperRule rule = redPaperRules.get(0);
        if (rule.getStatus() == 0) {
            log.info("规则被禁用, 不执行返利");
            return;
        }
        String shareTimes = getRuleValue(rule, CommonEnum.朋友圈分享限次.getValue());
        String shareScore = getRuleValue(rule, CommonEnum.朋友圈分享奖励.getValue());