新增加功能

Pu Zhibing

2025-04-28 361114b8d93fdfed72881e5446abde578df26ee2

新增加功能

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java

@@ -2,31 +2,30 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.SysCouponActivity;
import com.stylefeng.guns.modular.system.model.SysCouponRecord;
import com.stylefeng.guns.modular.system.model.TUser;
import com.stylefeng.guns.modular.system.model.UserCouponRecord;
import com.stylefeng.guns.modular.system.service.ISysCouponActivityService;
import com.stylefeng.guns.modular.system.service.ISysCouponRecordService;
import com.stylefeng.guns.modular.system.service.ITUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.model.SysCouponActivity;
import com.stylefeng.guns.modular.system.service.ISysCouponActivityService;
import org.springframework.web.bind.annotation.ResponseBody;

import java.util.*;

@@ -181,57 +180,7 @@
        }
        return SUCCESS_TIP;
    }
    class timerTaskTest extends TimerTask {
        private Integer id;

        public timerTaskTest(Integer id) {
            this.id = id;
        }
        @Override
        public void run() {
            SysCouponActivity sysCouponActivity = sysCouponActivityService.selectById(id);
            UserCouponRecord userCouponRecord = new UserCouponRecord();
            userCouponRecord.setMoney(sysCouponActivity.getMoney());
            userCouponRecord.setFullMoney(sysCouponActivity.getFullMoney());
            Date nowDay = new Date();
            userCouponRecord.setInsertTime(nowDay);
            userCouponRecord.setExpirationTime(new Date(nowDay.getTime()+sysCouponActivity.getEffective()*24*3600*1000L));
            userCouponRecord.setCompanyId(sysCouponActivity.getCompanyId());
            userCouponRecord.setState(1);
            userCouponRecord.setCouponType(sysCouponActivity.getCouponType());
            userCouponRecord.setCouponUseType(sysCouponActivity.getCouponUseType());
            userCouponRecord.setCouponActivityId(sysCouponActivity.getId());
            userCouponRecord.setActivityType(1);
            //判断发送类型1=全部用户，2=选择用户
            if(sysCouponActivity.getSendType()==1){
                Wrapper wrapper = new EntityWrapper<TUser>();
                if(sysCouponActivity.getCompanyType()!=1){
                    wrapper.eq("companyId",sysCouponActivity.getCompanyId());
                }
                List<TUser> list = userService.selectList(wrapper);
                for(TUser user:list){
                    userCouponRecord.setUserId(user.getId());
                    for (int i=0;i<sysCouponActivity.getNumber();i++){
                        userCouponRecord.insert();
                    }
                }
                sysCouponActivity.setSendUserNum(list.size());
                sysCouponActivity.updateById();
            }else{
               JSONArray  userId = JSON.parseArray(sysCouponActivity.getSendUserId());
                for(int j=0;j<userId.size();j++){
                    userCouponRecord.setUserId(userId.getJSONObject(j).getInteger("userId"));
                    for (int i=0;i<sysCouponActivity.getNumber();i++){
                        userCouponRecord.insert();
                    }
                }
                sysCouponActivity.setSendUserNum(userId.size());
                sysCouponActivity.updateById();

            }

        }
    }
    /**
     * 删除
     */
@@ -273,4 +222,57 @@
    public Object detail(@PathVariable("sysCouponActivityId") Integer sysCouponActivityId) {
        return sysCouponActivityService.selectById(sysCouponActivityId);
    }

    class timerTaskTest extends TimerTask {
        private Integer id;

        public timerTaskTest(Integer id) {
            this.id = id;
        }
        @Override
        public void run() {
            SysCouponActivity sysCouponActivity = sysCouponActivityService.selectById(id);
            UserCouponRecord userCouponRecord = new UserCouponRecord();
            userCouponRecord.setMoney(sysCouponActivity.getMoney());
            userCouponRecord.setFullMoney(sysCouponActivity.getFullMoney());
            Date nowDay = new Date();
            userCouponRecord.setInsertTime(nowDay);
            userCouponRecord.setExpirationTime(new Date(nowDay.getTime()+sysCouponActivity.getEffective()*24*3600*1000L));
            userCouponRecord.setCompanyId(sysCouponActivity.getCompanyId());
            userCouponRecord.setState(1);
            userCouponRecord.setCouponType(sysCouponActivity.getCouponType());
            userCouponRecord.setCouponUseType(sysCouponActivity.getCouponUseType());
            userCouponRecord.setCouponActivityId(sysCouponActivity.getId());
            userCouponRecord.setCouponId(sysCouponActivity.getCouponId());
            userCouponRecord.setActivityType(1);
            //判断发送类型1=全部用户，2=选择用户
            if(sysCouponActivity.getSendType()==1){
                Wrapper wrapper = new EntityWrapper<TUser>();
                if(sysCouponActivity.getCompanyType()!=1){
                    wrapper.eq("companyId",sysCouponActivity.getCompanyId());
                }
                List<TUser> list = userService.selectList(wrapper);
                for(TUser user:list){
                    userCouponRecord.setUserId(user.getId());
                    for (int i=0;i<sysCouponActivity.getNumber();i++){
                        userCouponRecord.insert();
                    }
                }
                sysCouponActivity.setSendUserNum(list.size());
                sysCouponActivity.updateById();
            }else{
               JSONArray  userId = JSON.parseArray(sysCouponActivity.getSendUserId());
                for(int j=0;j<userId.size();j++){
                    userCouponRecord.setUserId(userId.getJSONObject(j).getInteger("userId"));
                    for (int i=0;i<sysCouponActivity.getNumber();i++){
                        userCouponRecord.insert();
                    }
                }
                sysCouponActivity.setSendUserNum(userId.size());
                sysCouponActivity.updateById();

            }

        }
    }
}

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml

@@ -280,7 +280,7 @@
        left join t_user c on (a.userId = c.id)
        left join t_driver d on (a.driverId = d.id)
        left join t_company e on (d.companyId = e.id)
        left join t_pub_transaction_details f on (a.id = f.orderId and f.orderType = 2 and f.userType = 2)
        left join t_pub_transaction_details f on (a.id = f.orderId and f.userType = 2 and f.state = 2)
        where a.state in (8, 9) and a.isDelete = 1 and a.payManner = 1
        <if test="null != paymentCode and '' != paymentCode">
            and b.code like CONCAT('%', #{paymentCode}, '%')
@@ -321,7 +321,7 @@
        left join t_user c on (a.userId = c.id)
        left join t_driver d on (a.driverId = d.id)
        left join t_company e on (d.companyId = e.id)
        left join t_pub_transaction_details f on (a.id = f.orderId and f.orderType = 2 and f.userType = 2)
        left join t_pub_transaction_details f on (a.id = f.orderId and f.userType = 2 and f.state = 2)
        where a.state in (8, 9) and a.isDelete = 1 and (a.orderSource in (5, 6) or a.oldPeople = 1 or a.payManner = 2)
        <if test="null != orderCode and '' != orderCode">
            and a.orderNum like CONCAT('%', #{orderCode}, '%')

 ManagementOKTravel/guns-admin/src/main/resources/application.yml

@@ -66,14 +66,14 @@
#    password: XianNing@2024!
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat
#    url: jdbc:mysql://127.0.0.1:10633/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
#    username: root
#    password: XianNing@2024!
    url: jdbc:mysql://127.0.0.1:10633/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: XianNing@2024!
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat
    url: jdbc:mysql://127.0.0.1:3306/xianning_1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: 123456
#    url: jdbc:mysql://127.0.0.1:3306/xianning_1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
#    username: root
#    password: 123456
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat


 ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/financialStatement/offlineOrderStatistics/offlineOrderStatistics.js

@@ -70,7 +70,7 @@
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,
        content: Feng.ctxPath + '/tOrderTaxi/tOrderTaxi_update/' + TOrderTaxi.seItem.id
        content: Feng.ctxPath + '/tOrderTaxi/tOrderTaxi_update/' + id
    });
    this.layerIndex = index;
};

 ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.js

@@ -72,7 +72,7 @@
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,
        content: Feng.ctxPath + '/tOrderTaxi/tOrderTaxi_update/' + TOrderTaxi.seItem.id
        content: Feng.ctxPath + '/tOrderTaxi/tOrderTaxi_update/' + id
    });
    this.layerIndex = index;
};