7.22

luodangjia

2024-07-22 1b19574d0726d8982349fad29b736c3dc95a8e13

7.22

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

@@ -102,7 +102,22 @@
            Integer type = sysRedPacketRecord.getType();
            if(type == 1){//固定金额
                money = Double.valueOf(String.valueOf(sysRedPacketRecord.getMoney()));
            }else{//随机金额
            }

//            else{//随机金额
//                Double startMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getStartMoney()));
//                Double endMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getEndMoney()));
//                int i = new BigDecimal(endMoney).subtract(new BigDecimal(startMoney)).intValue();
//                Random random = new Random();
//                int num = random.nextInt(i);
//                money = new BigDecimal(startMoney).add(new BigDecimal(num)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
//            }

        }
        String[] split = ids.split(",");
        for (String s : split) {
        if(money > 0){
            if (sysRedPacketRecord.getType()!=1){
                Double startMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getStartMoney()));
                Double endMoney = Double.valueOf(String.valueOf(sysRedPacketRecord.getEndMoney()));
                int i = new BigDecimal(endMoney).subtract(new BigDecimal(startMoney)).intValue();
@@ -110,19 +125,16 @@
                int num = random.nextInt(i);
                money = new BigDecimal(startMoney).add(new BigDecimal(num)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
            }

        }
        String[] split = ids.split(",");
        for (String s : split) {
        if(money > 0){
            //添加临时红包数据
            UserRedPacketRecord userRedPacketRecord = new UserRedPacketRecord();
            userRedPacketRecord.setMoney(money);
            userRedPacketRecord.setRemainingAmount(money);
            userRedPacketRecord.setInsertTime(new Date());
            userRedPacketRecord.setCompanyId(1);
            userRedPacketRecord.setState(0);
            userRedPacketRecord.setOrderId(null);
            userRedPacketRecord.setOrderType(3);
            userRedPacketRecord.setRedPacketActivityId(redId);
//            userRedPacketRecord.setOrderType(3);
            userRedPacketRecord.setUserId(Integer.valueOf(s));
            userRedPacketRecordService.insert(userRedPacketRecord);
        }

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

@@ -160,6 +160,40 @@
        return PREFIX + "tSystemPrice_edit.html";
    }



    @RequestMapping("/tSmallPrice_update/{tSystemPriceId}")
    public String tSmallPrice_update(@PathVariable Integer tSystemPriceId, Model model) {
        TSystemPrice tSystemPrice = tSystemPriceService.selectById(tSystemPriceId);
        model.addAttribute("item",tSystemPrice);
        LogObjectHolder.me().set(tSystemPrice);

        JSONObject json = JSONObject.fromObject(tSystemPrice.getContent());
        model.addAttribute("json",json);

        //查询所有专车车型
//        List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 4).ne("state", 3));
//        List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
        List<TServerCarmodel> serverCarmodels = new ArrayList<>();
//        for(TServerCarmodel tsc : modelList){
//            boolean b = true;
//            for(TSystemPrice tsp : tSystemPrices){
//                if(tsc.getId() == tsp.getServerCarModelId() && tsc.getId() != tSystemPriceId){
//                    b = false;
//                    break;
//                }
//            }
//            if(b){
//                serverCarmodels.add(tsc);
//            }
//        }
        TServerCarmodel tSystemPrice1 = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
        serverCarmodels.add(tSystemPrice1);
        model.addAttribute("modelList", serverCarmodels);

        return PREFIX + "tSystemPrice_edit.html";
    }

    /**
     * 获取专车价格设置列表
     */

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;

import java.util.Date;

@@ -11,6 +12,7 @@
 * 用户红包记录
 */
@TableName("t_user_red_packet_record")
@Data
public class UserRedPacketRecord {
    /**
     * 主键
@@ -23,6 +25,9 @@
     */
    @TableField("money")
    private Double money;
    @TableField("remainingAmount")

    private Double remainingAmount;
//    /**
//     * 过期时间
//     */

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice.js

@@ -86,7 +86,7 @@
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: '专车价格设置详情',
            title: '小件物流价格设置详情',
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,