Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java

@@ -9,6 +9,8 @@
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.SysRedPacketRecord;
import com.stylefeng.guns.modular.system.model.UserCouponRecord;
import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -21,6 +23,7 @@
import com.stylefeng.guns.modular.system.service.ISysCouponRecordService;

import java.util.Date;
import java.util.List;
import java.util.Map;

/**
@@ -96,6 +99,42 @@
        return super.packForBT(sysCouponRecordService.selectPage(page,wrapper));
    }

    @Autowired
    private IUserCouponRecordService userCouponRecordService;
    @RequestMapping(value = "/list1")
    @ResponseBody
    public Object list1(String createTime,Integer couponUseType,Integer couponType) {

        Date startTimes = null;
        Date endTimes = null;
        if (SinataUtil.isNotEmpty(createTime)){
            String[] timeArray = createTime.split(" - ");
            startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
            endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
        }
        Page<SysCouponRecord> page = new PageFactory<SysCouponRecord>().defaultPage();
        Wrapper wrapper = new EntityWrapper<SysCouponRecord>();
        if(SinataUtil.isNotEmpty(createTime)){
            wrapper.between("insertTime",startTimes,endTimes);
        }
        if(SinataUtil.isNotEmpty(couponUseType)){
            wrapper.eq("couponUseType",couponUseType);
        }
        if(SinataUtil.isNotEmpty(couponType)){
            wrapper.eq("couponType",couponType);
        }
        wrapper.eq("companyId",ShiroKit.getUser().getObjectId());
        wrapper.eq("companyType",ShiroKit.getUser().getRoleType());
        wrapper.orderBy("id",false);
        Page page1 = sysCouponRecordService.selectPage(page, wrapper);
        List<SysCouponRecord> records = page1.getRecords();
        for (SysCouponRecord record : records) {
            int couponId = userCouponRecordService.selectCount(new EntityWrapper<UserCouponRecord>().eq("couponId", record.getId()));
            record.setReceive(couponId);
        }
        return super.packForBT(page1);
    }

    /**
     * 新增
     */