diff --git a/bweb/src/main/java/com/bweb/controller/TestController.java b/bweb/src/main/java/com/bweb/controller/TestController.java index bfd7f50..20b11dc 100644 --- a/bweb/src/main/java/com/bweb/controller/TestController.java +++ b/bweb/src/main/java/com/bweb/controller/TestController.java @@ -16,6 +16,7 @@ import com.hfkj.model.ResponseData; import com.hfkj.model.goods.JdGoodsModel; import com.hfkj.qianzhu.StarbucksService; import com.hfkj.service.card.BsUserCardService; +import com.hfkj.service.cms.CmsContentService; import com.hfkj.service.coupon.channel.YouTuCouponService; import com.hfkj.service.goods.*; import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl; @@ -25,6 +26,7 @@ import com.hfkj.service.order.BsOrderRefundService; import com.hfkj.service.order.BsOrderService; import com.hfkj.service.order.OrderPayService; import com.hfkj.service.pay.huift.TradeService; +import com.hfkj.sysenum.order.OrderLogisticsStatusEnum; import com.jd.open.api.sdk.domain.vopsp.CategoryInfoGoodsProvider.response.getCategoryInfoList.GetCategoryInfoGoodsResp; import com.jd.open.api.sdk.domain.vopsp.SkuInfoGoodsProvider.response.getSkuDetailInfo.GetSkuPoolInfoGoodsResp; import com.jd.open.api.sdk.domain.vopxx.MsgRecordProvider.response.queryTransByVopNormal.VopBizTransMessage; @@ -45,6 +47,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; @Controller @@ -65,6 +68,8 @@ public class TestController { @Resource private GoodsMsgService goodsMsgService; + @Resource + private CmsContentService cmsContentService; @RequestMapping(value="/thirdPayResult",method = RequestMethod.GET) @ResponseBody @@ -83,6 +88,48 @@ public class TestController { } + @RequestMapping(value="/getLogisticsMsg",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "更新物流") + public ResponseData getLogisticsMsg() { + try { + Map objectMap = new HashMap<>(); + + objectMap.put("status" , 2); + objectMap.put("createTime" , "createTime"); + + List orderGoodsList = orderGoodsService.getList(objectMap); + + orderGoodsList = orderGoodsList.stream().filter(order -> order.getLogisticsNo() != null).collect(Collectors.toList()); + + for (BsOrderGoods goods : orderGoodsList) { + + if (goods.getLogisticsNo() != null) { + GoodsLogistics logistics = (GoodsLogistics) orderGoodsService.getLogisticsMsgSchedule(goods.getLogisticsNo() , goods.getUserPhone()); + if (logistics.getLogisticsStatus() != null) { + goods.setLogisticsStatus(logistics.getLogisticsStatus()); + goods.setLogisticsStatusDesc(logistics.getLogisticsStatusDesc()); + + } else { + goods.setLogisticsStatus(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getCode()); + goods.setLogisticsStatusDesc(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getName()); + } + + goods.setUpdateTime(new Date()); + + orderGoodsService.update(goods); + } + + } + return ResponseMsgUtil.success("成功"); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/refundMovieOrder",method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "refundMovieOrder") @@ -224,23 +271,89 @@ public class TestController { } + @RequestMapping(value="/automaticData",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "自动数据") + public ResponseData automaticData() { + try { + + Map map = new HashMap<>(); + map.put("automatic" , 1); + map.put("status" , 1); + List list = cmsContentService.getList(map); + goodsMsgService.updateAutomatic(); + + + for (CmsContent cmsContent : list) { + List goodsModels = new ArrayList<>(); + if (cmsContent.getAutomatic() == 2) { + Map mapGoods = new HashMap<>(); + mapGoods.put("automatic", 1); + mapGoods.put("status", 1); + mapGoods.put("rand", 1); + map.put("type", 1); + mapGoods.put("salePriceS", 10); + mapGoods.put("salePriceE", 50); + mapGoods.put("limit", 25); + // 查询10-50价格商品 + goodsModels.addAll(goodsMsgService.getListCrest(mapGoods)); + mapGoods.put("salePriceS", 50.01); + mapGoods.put("salePriceE", 100); + mapGoods.put("limit", 10); + // 查询50.01-100价格商品 + goodsModels.addAll(goodsMsgService.getListCrest(mapGoods)); + mapGoods.put("salePriceS", 100.01); + mapGoods.put("salePriceE", 300); + mapGoods.put("limit", 5); + // 查询100.01 -300价格商品 + goodsModels.addAll(goodsMsgService.getListCrest(mapGoods)); + mapGoods.put("salePriceS", 300.01); + mapGoods.put("salePriceE", 500); + mapGoods.put("limit", 5); + // 查询300.001-500以上价格商品 + goodsModels.addAll(goodsMsgService.getListCrest(mapGoods)); + mapGoods.put("salePriceS", 500); + mapGoods.put("salePriceE", 100000); + mapGoods.put("limit", 5); + // 查询500以上价格商品 + goodsModels.addAll(goodsMsgService.getListCrest(mapGoods)); + + for (JdGoodsModel jdGoodsModel : goodsModels) { + GoodsMsg goodsMsg = goodsMsgService.queryDetail(Long.valueOf(jdGoodsModel.getId())); + goodsMsg.setAutomaticCode(cmsContent.getId()); + goodsMsg.setUpdateTime(new Date()); + goodsMsgService.update(goodsMsg); + } + } + + } + + return ResponseMsgUtil.success("成功"); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + + + @RequestMapping(value="/getGoodsJd",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "更新商品") + public ResponseData getGoodsJd() { + try { + jdService.getGoodsJd(); + return ResponseMsgUtil.success(""); -// @RequestMapping(value="/getGoodsJd",method = RequestMethod.GET) -// @ResponseBody -// @ApiOperation(value = "更新商品") -// public ResponseData getGoodsJd() { -// try { -// jdService.getGoodsJd(); -// return ResponseMsgUtil.success(""); -// -// } catch (Exception e) { -// log.error("error!",e); -// return ResponseMsgUtil.exception(e); -// } -// } + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } @RequestMapping(value="/confirmOrder",method = RequestMethod.GET) diff --git a/bweb/src/main/java/com/bweb/controller/cms/CmsContentController.java b/bweb/src/main/java/com/bweb/controller/cms/CmsContentController.java index f871eb6..a69033c 100644 --- a/bweb/src/main/java/com/bweb/controller/cms/CmsContentController.java +++ b/bweb/src/main/java/com/bweb/controller/cms/CmsContentController.java @@ -69,6 +69,7 @@ public class CmsContentController { cmsContent.setStatus(1); cmsContent.setName(body.getName()); cmsContent.setAppid(body.getAppid()); + cmsContent.setAutomatic(body.getAutomatic()); cmsContent.setJumpType(body.getJumpType()); cmsContent.setShowType(body.getShowType()); cmsContent.setJumpUrl(body.getJumpUrl()); diff --git a/bweb/src/main/java/com/bweb/controller/goods/GoodsController.java b/bweb/src/main/java/com/bweb/controller/goods/GoodsController.java index b7f466a..98ff890 100644 --- a/bweb/src/main/java/com/bweb/controller/goods/GoodsController.java +++ b/bweb/src/main/java/com/bweb/controller/goods/GoodsController.java @@ -137,6 +137,7 @@ public class GoodsController { goodsMsg.setGoodsTypeParent(goodsType.getParentId()); goodsMsg.setGoodsTypeParentName(goodsTypeService.findGoodsType(goodsType.getParentId())); goodsMsg.setType(body.getType()); + goodsMsg.setSort(body.getSort()); goodsMsg.setShowType(body.getShowType()); goodsMsg.setGoodsBrand(body.getGoodsBrand()); goodsMsg.setStatus(body.getStatus()); diff --git a/cweb/src/main/java/com/cweb/controller/cms/CmsContentController.java b/cweb/src/main/java/com/cweb/controller/cms/CmsContentController.java index a75f9ac..2b2bb67 100644 --- a/cweb/src/main/java/com/cweb/controller/cms/CmsContentController.java +++ b/cweb/src/main/java/com/cweb/controller/cms/CmsContentController.java @@ -66,7 +66,7 @@ public class CmsContentController { for (CmsContent cmsContent : list) { List goodsModels = new ArrayList<>(); - if (cmsContent.getShowType() != null) { + Map goodsMap = new HashMap<>(); goodsMap.put("status" , 1); @@ -74,27 +74,61 @@ public class CmsContentController { List goodsMsgs = new ArrayList<>(); - if (cmsContent.getShowType() == 1) { - goodsMap.put("goodsType", cmsContent.getShowDataId()); + if ( cmsContent.getShowType() != null && cmsContent.getShowType() == 1) { + + if (cmsContent.getAutomatic() == 1) { + goodsMap.put("goodsType", cmsContent.getShowDataId()); + if (cmsContent.getShowDataId() != null) { + cmsContent.setJumpUrl(cmsContent.getJumpUrl() + "&goodsType=" + cmsContent.getShowDataId()); + } + } else { + cmsContent.setJumpUrl(cmsContent.getJumpUrl() + "&automaticCode=" + cmsContent.getId()); + goodsMap.put("automaticCode" , cmsContent.getId()); + } goodsMap.put("limit" , 2); goodsMsgs = goodsMsgService.getListCrest(goodsMap); } - if (cmsContent.getShowType() == 2) { - goodsMap.put("goodsType", cmsContent.getShowDataId()); + if (cmsContent.getShowType() != null && cmsContent.getShowType() == 2) { + if (cmsContent.getAutomatic() == 1) { + goodsMap.put("goodsType", cmsContent.getShowDataId()); + if (cmsContent.getShowDataId() != null) { + cmsContent.setJumpUrl(cmsContent.getJumpUrl() + "&goodsType=" + cmsContent.getShowDataId()); + } + } else { + cmsContent.setJumpUrl(cmsContent.getJumpUrl() + "&automaticCode=" + cmsContent.getId()); + goodsMap.put("automaticCode" , cmsContent.getId()); + } goodsMap.put("limit" , 4); goodsMap.put("saleNum" , 2); + goodsMsgs = goodsMsgService.getListCrest(goodsMap); } - if (cmsContent.getShowType() == 3) { - goodsMap.put("goodsType", cmsContent.getShowDataId()); + if (cmsContent.getShowType() != null && cmsContent.getShowType() == 3) { + if (cmsContent.getAutomatic() == 1) { + goodsMap.put("goodsType", cmsContent.getShowDataId()); + if (cmsContent.getShowDataId() != null) { + cmsContent.setJumpUrl(cmsContent.getJumpUrl() + "&goodsType=" + cmsContent.getShowDataId()); + } + } else { + cmsContent.setJumpUrl(cmsContent.getJumpUrl() + "&automaticCode=" + cmsContent.getId()); + goodsMap.put("automaticCode" , cmsContent.getId()); + } goodsMap.put("limit" , 10); goodsMap.put("type" , 1); goodsMsgs = goodsMsgService.getListCrest(goodsMap); } + if (cmsContent.getAutomatic() == 1) { + goodsMap.put("goodsType", cmsContent.getShowDataId()); + if (cmsContent.getShowDataId() != null) { + cmsContent.setJumpUrl(cmsContent.getJumpUrl() + "&goodsType=" + cmsContent.getShowDataId()); + } + } else { + cmsContent.setJumpUrl(cmsContent.getJumpUrl() + "&automaticCode=" + cmsContent.getId()); + goodsMap.put("automaticCode" , cmsContent.getId()); + } goodsModels.addAll(goodsMsgs); - } CmsContentModel cmsContentModel = new CmsContentModel(); BeanUtils.copyProperties(cmsContent, cmsContentModel); diff --git a/cweb/src/main/java/com/cweb/controller/goods/GoodsController.java b/cweb/src/main/java/com/cweb/controller/goods/GoodsController.java index 8f72b09..00f761f 100644 --- a/cweb/src/main/java/com/cweb/controller/goods/GoodsController.java +++ b/cweb/src/main/java/com/cweb/controller/goods/GoodsController.java @@ -113,6 +113,7 @@ public class GoodsController { @RequestParam(value = "goodsTypeParent", required = false) Long goodsTypeParent, @RequestParam(value = "goodsType", required = false) Long goodsType, @RequestParam(value = "showType", required = false) Integer showType, + @RequestParam(value = "automaticCode", required = false) Long automaticCode, @RequestParam(value = "discountId", required = false) Integer discountId, @RequestParam(value = "goodsBrand", required = false) Long goodsBrand, @RequestParam(value = "price", required = false) Integer price, @@ -134,8 +135,12 @@ public class GoodsController { map.put("goodsType", goodsType); map.put("showType", showType); map.put("price", price); + if (time == null && saleNum == null && price == null) { + map.put("sort", 2); + } map.put("goodsTypeParent", goodsTypeParent); map.put("goodsBrand", goodsBrand); + map.put("automaticCode", automaticCode); map.put("saleNum", saleNum); map.put("salePriceS", salePriceS); map.put("salePriceE", salePriceE); @@ -160,10 +165,10 @@ public class GoodsController { List sp = couponDiscountGoodsRel.stream().map(CouponDiscountGoodsRel::getSpecsId).collect(Collectors.toList()); map.put("specsId", sp); } - System.out.println("=========================参数+" + map); List list = goodsMsgService.getListCrest(map); +// return ResponseMsgUtil.success(list); return ResponseMsgUtil.success(PageUtil.initPageInfoObj(pageNum, list.size(), pageSize, new PageInfo<>(list))); } catch (Exception e) { diff --git a/schedule/src/main/java/com/hfkj/schedule/JdGoodsSchedule.java b/schedule/src/main/java/com/hfkj/schedule/JdGoodsSchedule.java index 25e744f..00e42e4 100644 --- a/schedule/src/main/java/com/hfkj/schedule/JdGoodsSchedule.java +++ b/schedule/src/main/java/com/hfkj/schedule/JdGoodsSchedule.java @@ -1,13 +1,16 @@ package com.hfkj.schedule; import com.alibaba.fastjson.JSONObject; -import com.hfkj.entity.BsOrderCoupon; -import com.hfkj.entity.BsOrderCouponNo; +import com.hfkj.common.utils.DateUtil; +import com.hfkj.entity.*; import com.hfkj.jd.JdService; +import com.hfkj.model.goods.JdGoodsModel; +import com.hfkj.service.cms.CmsContentService; import com.hfkj.service.coupon.BsOrderCouponNoService; import com.hfkj.service.coupon.BsOrderCouponService; import com.hfkj.service.coupon.channel.HuiLianTongCouponService; import com.hfkj.service.coupon.channel.YouTuCouponService; +import com.hfkj.service.goods.GoodsMsgService; import com.hfkj.service.hlt.HuiLianTongUnionCardService; import com.hfkj.service.order.BsOrderChildService; import com.hfkj.service.order.BsOrderService; @@ -19,10 +22,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.Scheduled; import javax.annotation.Resource; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @Auther: 胡锐 @@ -38,6 +38,12 @@ public class JdGoodsSchedule { @Resource private JdService jdService; + @Resource + private GoodsMsgService goodsMsgService; + + @Resource + private CmsContentService cmsContentService; + //每10分钟执行一次 @Scheduled(cron = "0 0/10 * * * ?") public void etcCarMsg() { @@ -50,4 +56,60 @@ public class JdGoodsSchedule { } } + + //每日凌晨12点1秒执行一次 + @Scheduled(cron = "1 0 0 * * ?") + public void automaticData() { + Map map = new HashMap<>(); + map.put("automatic" , 1); + map.put("status" , 1); + List list = cmsContentService.getList(map); + goodsMsgService.updateAutomatic(); + + + for (CmsContent cmsContent : list) { + List goodsModels = new ArrayList<>(); + if (cmsContent.getAutomatic() == 2) { + Map mapGoods = new HashMap<>(); + mapGoods.put("automatic", 1); + mapGoods.put("status", 1); + mapGoods.put("rand", 1); + map.put("type", 1); + mapGoods.put("salePriceS", 10); + mapGoods.put("salePriceE", 50); + mapGoods.put("limit", 25); + // 查询10-50价格商品 + goodsModels.addAll(goodsMsgService.getListCrest(mapGoods)); + mapGoods.put("salePriceS", 50.01); + mapGoods.put("salePriceE", 100); + mapGoods.put("limit", 10); + // 查询50.01-100价格商品 + goodsModels.addAll(goodsMsgService.getListCrest(mapGoods)); + mapGoods.put("salePriceS", 100.01); + mapGoods.put("salePriceE", 300); + mapGoods.put("limit", 5); + // 查询100.01 -300价格商品 + goodsModels.addAll(goodsMsgService.getListCrest(mapGoods)); + mapGoods.put("salePriceS", 300.01); + mapGoods.put("salePriceE", 500); + mapGoods.put("limit", 5); + // 查询300.001-500以上价格商品 + goodsModels.addAll(goodsMsgService.getListCrest(mapGoods)); + mapGoods.put("salePriceS", 500); + mapGoods.put("salePriceE", 100000); + mapGoods.put("limit", 5); + // 查询500以上价格商品 + goodsModels.addAll(goodsMsgService.getListCrest(mapGoods)); + + for (JdGoodsModel jdGoodsModel : goodsModels) { + GoodsMsg goodsMsg = goodsMsgService.queryDetail(Long.valueOf(jdGoodsModel.getId())); + goodsMsg.setAutomaticCode(cmsContent.getId()); + goodsMsg.setUpdateTime(new Date()); + goodsMsgService.update(goodsMsg); + } + } + + } + } + } diff --git a/service/src/main/java/com/hfkj/dao/GoodsMsgMapperExt.java b/service/src/main/java/com/hfkj/dao/GoodsMsgMapperExt.java index 766431e..f9732f0 100644 --- a/service/src/main/java/com/hfkj/dao/GoodsMsgMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/GoodsMsgMapperExt.java @@ -1,10 +1,13 @@ package com.hfkj.dao; import com.hfkj.entity.GoodsMsg; +import com.hfkj.entity.GoodsSpecs; +import com.hfkj.entity.SecDictionary; import com.hfkj.model.goods.JdGoodsModel; import com.hfkj.model.order.OrderCouponModel; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; import java.util.Map; @@ -67,6 +70,8 @@ public interface GoodsMsgMapperExt { " a.goods_brand_name as goodsBrandName," + " a.title as title," + " a.list_img as listImg," + + " a.sort as sort," + + " a.automatic_code as automaticCode," + " a.sale_num as saleNum," + " b.third_price as thirdPrice," + " b.original_price as originalPrice," + @@ -84,18 +89,27 @@ public interface GoodsMsgMapperExt { " and a.goods_type = #{param.goodsType} " + " and a.show_type = #{param.showType} " + " and a.third_id is not null " + + " and a.automatic_code is null " + + " and a.automatic_code = #{param.automaticCode} " + " and b.id in #{item} " + " and a.goods_brand = #{param.goodsBrand} " + " = #{param.salePriceS} ]]>" + " " + " group by a.id) c" + - " ORDER BY c.updateTime desc" + - " ORDER BY c.createtime asc" + - " ORDER BY c.salePrice asc" + - " ORDER BY c.salePrice desc" + - " ORDER BY c.saleNum desc" + + " ORDER BY c.sort asc , c.id" + + " ORDER BY c.sort asc , c.id" + + " ORDER BY c.salePrice asc , c.id" + + " ORDER BY c.salePrice desc , c.id" + + " ORDER BY c.saleNum desc , c.id" + + " ORDER BY c.sort asc , c.id" + + " ORDER BY rand()" + " limit #{param.limit}" + "") List getGoodsListCrest(@Param("param") Map param); + + @Update({ + "update goods_msg set automatic_code = null where automatic_code is not null", + }) + void updateAutomatic(); } \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java b/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java index 17bf8b2..7149efb 100644 --- a/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java @@ -60,6 +60,9 @@ public class CmsContentServiceImpl implements CmsContentService { } else { criteria.andStatusNotEqualTo(0); } + if (MapUtils.getInteger(map, "automatic") != null) { + criteria.andAutomaticIsNotNull(); + } if (StringUtils.isNotBlank(MapUtils.getString(map, "platformCode"))) { criteria.andPlatformCodeEqualTo(MapUtils.getString(map, "platformCode")); } diff --git a/service/src/main/java/com/hfkj/service/goods/GoodsMsgService.java b/service/src/main/java/com/hfkj/service/goods/GoodsMsgService.java index 70db9c5..67fbc99 100644 --- a/service/src/main/java/com/hfkj/service/goods/GoodsMsgService.java +++ b/service/src/main/java/com/hfkj/service/goods/GoodsMsgService.java @@ -101,5 +101,6 @@ public interface GoodsMsgService { * @return */ void editSaleNum(Long goodsId , Integer num , Integer type); + void updateAutomatic(); } diff --git a/service/src/main/java/com/hfkj/service/goods/impl/GoodsMsgServiceImpl.java b/service/src/main/java/com/hfkj/service/goods/impl/GoodsMsgServiceImpl.java index 59020d1..3a76874 100644 --- a/service/src/main/java/com/hfkj/service/goods/impl/GoodsMsgServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/goods/impl/GoodsMsgServiceImpl.java @@ -162,6 +162,12 @@ public class GoodsMsgServiceImpl implements GoodsMsgService { return goodsMsgMapper.selectByExample(example); } + + @Override + public void updateAutomatic() { + goodsMsgMapper.updateAutomatic(); + } + @Override public void editSaleNum(Long goodsId, Integer num , Integer type) { diff --git a/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java b/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java index 27dfd40..a2d79cb 100644 --- a/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java +++ b/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java @@ -182,7 +182,7 @@ public class OrderPaySuccessService { JSONArray dataArray = returnParam.getJSONObject("return_data").getJSONArray("codeList"); couponNo.setExpireTime(dataArray.getJSONObject(0).getDate("expirationDate")); couponNo.setDeliverTime(new Date()); - couponNo.setGoodsVpdSourceCouNo(vpd.getKey()); + couponNo.setGoodsVpdSourceCouNo(returnParam.getJSONObject("return_data").getString("reqId")); couponNo.setStatus(OrderCouponNoStatusEnum.status2.getCode()); orderCouponNoService.editData(couponNo); } diff --git a/service/src/main/java/com/hfkj/service/order/impl/OrderSettlementServiceImpl.java b/service/src/main/java/com/hfkj/service/order/impl/OrderSettlementServiceImpl.java index 3c04714..ce1eae6 100644 --- a/service/src/main/java/com/hfkj/service/order/impl/OrderSettlementServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/order/impl/OrderSettlementServiceImpl.java @@ -179,6 +179,8 @@ public class OrderSettlementServiceImpl implements OrderSettlementService { List orderCouponList = orderCouponService.getOrderCouponList(map); Map mapCou = new HashMap<>(); mapCou.put("couStatus", 2); + mapCou.put("createTimeS", map.get("finishTimeS")); + mapCou.put("createTimeE", map.get("finishTimeE")); // 查询卡券订单卡密 List orderCouponModelList = orderCouponService.getOrderList(mapCou);