igo出行
parent: f08b7e95 | 补丁 | 提交 | ignore whitespace
Pu Zhibing
2024-10-22 af06cd29722f6cb1c431565c4710d9fe9b7b33a1 
修改bug和翻译
9个文件已修改
57 ■■■■■ 已修改文件
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/resources/logback-spring.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserIGOTravel/guns-admin/src/main/resources/logback-spring.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java


@@ -1,9 +1,12 @@


package com.stylefeng.guns.modular.api;






import com.stylefeng.guns.core.util.MD5Util;


import com.stylefeng.guns.core.util.ToolUtil;


import com.stylefeng.guns.modular.system.model.Withdrawal;


import com.stylefeng.guns.modular.system.service.IDriverService;


import com.stylefeng.guns.modular.system.service.IWithdrawalService;


import com.stylefeng.guns.modular.system.util.RedisUtil;


import com.stylefeng.guns.modular.system.util.ResultUtil;


import com.stylefeng.guns.modular.system.warpper.WithdrawalListWarpper;


import com.stylefeng.guns.modular.system.warpper.WithdrawalWarpper;


@@ -17,6 +20,7 @@


import org.springframework.web.bind.annotation.ResponseBody;


import org.springframework.web.bind.annotation.RestController;




import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import java.util.*;




@@ -33,6 +37,9 @@




    @Autowired


    private IDriverService driverService;


    


    @Resource


    private RedisUtil redisUtil;






    /**


@@ -54,6 +61,12 @@


            if(null == uid){


                return ResultUtil.tokenErr();


            }


            String format = String.format("uid=%s&money=%s&type=%s", uid, money, type);


            String key = MD5Util.encrypt(format);


            String value = redisUtil.getValue(key);


            if(ToolUtil.isNotEmpty(value) && (System.currentTimeMillis() - Long.valueOf(value)) <= 1000){


                return ResultUtil.error(language == 1 ? "请勿重复操作" : language == 2 ? "Don't repeat the operation" : "Ne répétez pas l’opération");


            }


            return withdrawalService.withdrawal(money, uid, type, remark, language);


        }catch (Exception e){


            e.printStackTrace();




 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java


@@ -25,6 +25,9 @@


     */


    @Override


    public String queryByType(Integer type, Integer language) throws Exception {


        if(type == 16 || type == 15 || type == 13 || type == 7 || type == 4 || type == 5 || type == 8 || type == 9 || type == 10){


            language = 1;


        }


        String s = agreementMapper.queryByType(language, type, 2);


        if(ToolUtil.isEmpty(s)){


            s = agreementMapper.queryByType(language, type, null);




 DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml


@@ -48,7 +48,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档只记录debug级别的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


@@ -75,7 +75,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档只记录info级别的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


@@ -101,7 +101,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档只记录warn级别的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


@@ -127,7 +127,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档只记录ERROR级别的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


@@ -153,7 +153,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档记录除了DEBUG级别的其它高于DEBUG的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">




 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java


@@ -347,7 +347,7 @@


                                chinese_go.text("寄包裹");


                            }


                            Element chinese_discount = document1.getElementById("chinese_discount");


                            chinese_discount.text("每单费用折扣" + aDouble + "%");


                            chinese_discount.text("每单费用折扣" + new BigDecimal(100).subtract(new BigDecimal(aDouble)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() + "%");


                            EmailUtil.send(user.getEmail(), "折扣活动",  document1.html());


                        }


                        if(2 == language){




 ManagementIGOTravel/guns-admin/src/main/resources/logback-spring.xml


@@ -48,7 +48,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档只记录debug级别的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


@@ -75,7 +75,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档只记录info级别的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


@@ -101,7 +101,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档只记录warn级别的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


@@ -127,7 +127,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档只记录ERROR级别的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


@@ -153,7 +153,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档记录除了DEBUG级别的其它高于DEBUG的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">




 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java


@@ -1266,10 +1266,10 @@


            if(null == uid){


                return ResultUtil.tokenErr();


            }


            String format = String.format("payType=%s&orderId=%s&orderType=%s", payType, orderId, orderType);


            String format = String.format("uid=%s&payType=%s&orderId=%s&orderType=%s", uid, payType, orderId, orderType);


            String key = MD5Util.encrypt(format);


            String value = redisUtil.getValue(key);


            if(ToolUtil.isNotEmpty(value) && (System.currentTimeMillis() - Long.valueOf(value)) >= 1000){


            if(ToolUtil.isNotEmpty(value) && (System.currentTimeMillis() - Long.valueOf(value)) <= 1000){


                return ResultUtil.error(language == 1 ? "请勿重复操作" : language == 2 ? "Don't repeat the operation" : "Ne répétez pas l’opération");


            }


            redisUtil.setStrValue(key, System.currentTimeMillis() + "", 5);




 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java


@@ -1774,7 +1774,7 @@


                if(d.compareTo(new BigDecimal(0)) > 0){


                    SettlementDetail settlementDetail = new SettlementDetail();


                    settlementDetail.setOrderId(orderId);


                    settlementDetail.setOrderType(1);


                    settlementDetail.setOrderType(4);


                    settlementDetail.setDriverId(driver.getId());


                    settlementDetail.setOrderMoney(orderLogistics.getOrderMoney());


                    settlementDetail.setPrice(d.doubleValue());




 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java


@@ -28,6 +28,9 @@


        if(null == language){


            language = 2;


        }


        if(type == 16 || type == 15 || type == 13 || type == 7 || type == 4 || type == 5 || type == 8 || type == 9 || type == 10){


            language = 1;


        }


        String s = agreementMapper.queryByType(type, language, 1);


        if(ToolUtil.isEmpty(s)){


            s = agreementMapper.queryByType(type, language, null);




 UserIGOTravel/guns-admin/src/main/resources/logback-spring.xml


@@ -48,7 +48,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档只记录debug级别的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


@@ -75,7 +75,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档只记录info级别的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


@@ -101,7 +101,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档只记录warn级别的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


@@ -127,7 +127,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档只记录ERROR级别的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


@@ -153,7 +153,7 @@


                <maxFileSize>100MB</maxFileSize>


            </timeBasedFileNamingAndTriggeringPolicy>


            <!--日志文档保留天数-->


            <maxHistory>15</maxHistory>


            <maxHistory>180</maxHistory>


        </rollingPolicy>


        <!-- 此日志文档记录除了DEBUG级别的其它高于DEBUG的 -->


        <filter class="ch.qos.logback.classic.filter.LevelFilter">