2.0bug修改

无关风月

2024-07-22 1efe24d80664c9471ab8f7fd7664d97b2f2e7b83

2.0bug修改

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java

@@ -148,7 +148,12 @@
        String s = replace + ":00";
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        Date date = dateFormat.parse(s);
        if (date.before(new Date())){
            // 选择的生效时间不能小于当前时间
            return 501;
        }
        tSysRedSet.setInsertTime(new Date());
        tSysRedSet.setUpdateTime(new Date());
        tSysRedSet.setEffectiveDate(date);
        tSysRedSet.setStatus(1);
        redEnvelopePaymentSettingsService.insert(tSysRedSet);

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java

@@ -121,13 +121,12 @@
        tIntegralOrder.setState(2);
        tIntegralOrder.setManageRemark(tIntegralOrder.getRemark());
        tIntegralOrder.setRemark(null);

        tIntegralOrderService.updateById(tIntegralOrder);
        
        TIntegralOrder tIntegralOrder1 = tIntegralOrderService.selectById(tIntegralOrder.getId());
        new Thread(new Runnable() {
            @Override
            public void run() {
                TUser tUser = userService.selectById(tIntegralOrder.getUserId());
                TUser tUser = userService.selectById(tIntegralOrder1.getUserId());
                if(ToolUtil.isNotEmpty(tUser.getEmail())){
                    try {
                        Integer language = tUser.getLanguage();

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralOrderMapper.xml

@@ -23,7 +23,9 @@

    <!--根据条件查询兑换订单列表-->
    <select id="getIntegralOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        SELECT * FROM (SELECT ui.nickName as userName,ig.`name` as goodsName,io.id,io.insertTime,io.userId,io.goodsId,io.num,io.consigneeName,io.consigneePhone,io.consigneeAddress,io.state,io.manageRemark as remark FROM t_integral_order as io
        SELECT * FROM (
        SELECT
            ui.nickName as userName,ig.`name` as goodsName,io.id,io.insertTime,io.userId,io.goodsId,io.num,io.consigneeName,io.consigneePhone,io.consigneeAddress,io.state,io.manageRemark as remark FROM t_integral_order as io
        LEFT JOIN t_user as ui on ui.id = io.userId
        LEFT JOIN t_integral_goods as ig on ig.id = io.goodsId) as o
        <where>

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralOrder.java

@@ -64,6 +64,7 @@
     * 状态 1=未处理 2=已处理 3=已删除
     */
    private Integer state;
    private Integer integral;
    private String manageRemark;



 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html

@@ -340,7 +340,7 @@
                    <div class="form-group">
                        <label class="col-sm-2 control-label">预约订单取消规则：</label>
                        <div class="col-sm-10">
                            订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                            预约订单在预约时间前&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                           @if(isNotEmpty(orderAcceptanceTime1)){
                                                           value="${orderAcceptanceTime1}"
                                                           @}else{

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html

@@ -239,11 +239,6 @@
                                    每个红包金额：&nbsp;<input type="text"  name="zc1" id="content6Num3" class="form-control newWidth"  readonly/>&nbsp;
                                    <br/>
                                    <br/>
                                    有效期：
                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    &nbsp;<input type="text"  name="zc1" id="content6Num4" class="form-control newWidth" readonly/>&nbsp;天
                                    <br/>
                                    <br/>
                                    最高金额：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="text"  name="zc1" id="content6Num5" class="form-control newWidth" />&nbsp;
                                    <br/>
                                </div>

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html

@@ -454,6 +454,7 @@
                    </div>
                </div>
            </div>
            </div>

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSetInfo.js

@@ -27,6 +27,10 @@
    console.log("startTime:"+startTime)
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tSysReformist/redSet/add", function(data){
        if (data == "501"){
            Feng.error("红包折扣生效时间不能晚于当前时间！");
            return;
        }
        Feng.success("添加成功!");
        window.parent.TSite.table.refresh();
        TSiteInfo.close();