| @@ -90,7 +90,7 @@ public class WxCardPayController extends BaseController { | |||||
| final PageInfo<WxCardVo> page = wxCardInfoService.listAsPage(wxCardVo, pageNum, pageSize); | final PageInfo<WxCardVo> page = wxCardInfoService.listAsPage(wxCardVo, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @ApiOperation("C端扫B端储值卡交易流水(消费记录 + 补贴)列表接口") | @ApiOperation("C端扫B端储值卡交易流水(消费记录 + 补贴)列表接口") | ||||
| @GetMapping("cardSpendlist") | @GetMapping("cardSpendlist") | ||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @@ -14,6 +14,7 @@ import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.po.MallUserInfo; | import com.iformall.domain.po.MallUserInfo; | ||||
| import com.iformall.domain.po.WxCoupon; | import com.iformall.domain.po.WxCoupon; | ||||
| import com.iformall.domain.po.WxCouponPassword; | import com.iformall.domain.po.WxCouponPassword; | ||||
| import com.iformall.domain.vo.WxCardSpendVo; | |||||
| import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; | import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; | ||||
| import com.iformall.domain.vo.WxCouponPasswordVo; | import com.iformall.domain.vo.WxCouponPasswordVo; | ||||
| import com.iformall.enums.EnumCouponPasswordStatus; | import com.iformall.enums.EnumCouponPasswordStatus; | ||||
| @@ -32,6 +33,8 @@ import java.io.BufferedInputStream; | |||||
| import java.io.File; | import java.io.File; | ||||
| import java.io.FileOutputStream; | import java.io.FileOutputStream; | ||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import java.util.ArrayList; | |||||
| import java.util.List; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| import java.util.concurrent.TimeUnit; | import java.util.concurrent.TimeUnit; | ||||
| @@ -132,6 +135,21 @@ public class WxCouponPasswordController extends BaseController { | |||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @ApiOperation("卡密记录导出") | |||||
| @GetMapping("/exportData") | |||||
| @SystemControllerLog(description = "卡检索-卡密记录导出") | |||||
| public void exportData(@ModelAttribute WxCouponPassword wxCouponPassword, HttpServletRequest request, HttpServletResponse response) { | |||||
| wxCouponPassword.updateTenantInfo(getTenantInfo()); | |||||
| wxCouponPassword.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | |||||
| StringBuffer statussb = new StringBuffer(); | |||||
| statussb.append(EnumCouponPasswordStatus.MSG_SENDED.getCode()).append(",") | |||||
| .append(EnumCouponPasswordStatus.MSG_SENDING.getCode()).append(",") | |||||
| .append(EnumCouponPasswordStatus.USED.getCode()).append(",") | |||||
| .append(EnumCouponPasswordStatus.CANCEL.getCode()); | |||||
| wxCouponPassword.setStatusStr(statussb.toString()); | |||||
| wxCouponPasswordService.exportData(wxCouponPassword, request, response); | |||||
| } | |||||
| @ApiOperation("启用/停用") | @ApiOperation("启用/停用") | ||||
| @PostMapping("/startOrStop") | @PostMapping("/startOrStop") | ||||
| @SystemControllerLog(description = "启用/停用") | @SystemControllerLog(description = "启用/停用") | ||||
| @@ -5,6 +5,7 @@ import com.iformall.domain.po.MallUserInfo; | |||||
| import com.iformall.domain.po.WxCouponPassword; | import com.iformall.domain.po.WxCouponPassword; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.domain.vo.WxCardPriceTemplate; | import com.iformall.domain.vo.WxCardPriceTemplate; | ||||
| import com.iformall.domain.vo.WxCardSpendVo; | |||||
| import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; | import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; | ||||
| import com.iformall.domain.vo.WxCouponPasswordVo; | import com.iformall.domain.vo.WxCouponPasswordVo; | ||||
| @@ -26,6 +27,8 @@ public interface WxCouponPasswordService { | |||||
| PageInfo<WxCouponPasswordVo> listVoAsPage(WxCouponPassword record, Integer pageIndex, Integer pageSize); | PageInfo<WxCouponPasswordVo> listVoAsPage(WxCouponPassword record, Integer pageIndex, Integer pageSize); | ||||
| void exportData(WxCouponPassword wxCouponPassword, HttpServletRequest request, HttpServletResponse response); | |||||
| /** | /** | ||||
| * 根据Id获得实体 | * 根据Id获得实体 | ||||
| * | * | ||||
| @@ -11,6 +11,7 @@ import com.iformall.enums.EnumCouponPasswordStatus; | |||||
| import com.iformall.enums.EnumYesOrNo; | import com.iformall.enums.EnumYesOrNo; | ||||
| import com.iformall.domain.vo.WxCUserBasicInfoVo; | import com.iformall.domain.vo.WxCUserBasicInfoVo; | ||||
| import com.iformall.domain.vo.WxCardPriceTemplate; | import com.iformall.domain.vo.WxCardPriceTemplate; | ||||
| import com.iformall.domain.vo.WxCardSpendVo; | |||||
| import com.iformall.domain.vo.WxCouponOrderBVo; | import com.iformall.domain.vo.WxCouponOrderBVo; | ||||
| import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; | import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; | ||||
| import com.iformall.domain.vo.WxCouponPasswordVo; | import com.iformall.domain.vo.WxCouponPasswordVo; | ||||
| @@ -190,6 +191,12 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { | |||||
| return new ArrayList<WxCouponPasswordVo>(); | return new ArrayList<WxCouponPasswordVo>(); | ||||
| } | } | ||||
| @Override | |||||
| public void exportData(WxCouponPassword wxCouponPassword, HttpServletRequest request, HttpServletResponse response) { | |||||
| PageInfo<WxCouponPasswordVo> pageInfo = this.listVoAsPage(wxCouponPassword, 1, 5000); | |||||
| excelService.exportExcel(pageInfo.getList(), null, "卡密记录", WxCouponPasswordVo.class, "卡密记录.xlsx", response, false); | |||||
| } | |||||
| @Override | @Override | ||||
| public WxCouponPassword getById(Long id) { | public WxCouponPassword getById(Long id) { | ||||