From 271d33b58d60ea72faaba91d9bbef9dce898c1b2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 9 Oct 2021 16:29:42 +0800 Subject: [PATCH 01/18] update gift --- .../order/impl/batch/CouponPackageOrderAdapterService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java index 18c5b5187..7fe52565c 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java @@ -2,19 +2,16 @@ package com.iformall.service.order.impl.batch; import java.util.Date; import java.util.List; -import java.util.Objects; import com.aliyun.openservices.shade.com.alibaba.fastjson.JSON; import com.iformall.common.ErrorCode; -import com.iformall.common.IdWorker; import com.iformall.domain.po.*; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.vo.WxCouponSendVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -57,6 +54,7 @@ public class CouponPackageOrderAdapterService extends BaseBatchOrderAdapterServi } @Override + @Async @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void doOthersAfterPaySuccess(WxOrder order, WxPayOrder record, WxCouponOrder couponOrder) { WxCoupon wxCoupon = wxCouponMapper.selectById(couponOrder.getCouponId(), couponOrder.getTenantId()); From 0d1f0b96cfb550d6a1e209bd874528dc0c2b48e6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 9 Oct 2021 19:01:32 +0800 Subject: [PATCH 02/18] update gift --- .../controller/WxOrderController.java | 77 +++++++++++++++++++ .../iformall/domain/vo/WxOrderCouponVo.java | 8 ++ .../service/impl/WxOrderServiceImpl.java | 10 ++- .../main/resources/mapper/WxOrderMapper.xml | 3 +- 4 files changed, 96 insertions(+), 2 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index ff4a729c4..82cfd40ee 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -271,6 +271,83 @@ public class WxOrderController extends BaseController { return new ResultData(wxOrderCVo); } + @ApiOperation("订单详情接口") + @GetMapping("detail_v1") + @ApiImplicitParams({ + @ApiImplicitParam(name = "orderId", value = "订单id", dataType = "String", paramType = "query", required = true) + }) + public ResultData detail_v1(String orderId) { + if (StringUtils.isBlank(orderId) || orderId.equalsIgnoreCase(Constant.UNDEFINED)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + // c端用户应该只能看到自己的订单细节 + WxOrder wxOrder = new WxOrder(); + Long id = 0L; + try { + id = Long.valueOf(orderId); + } catch (NumberFormatException e) { + logger.error("parse orderId failed"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常:"+orderId); + } + wxOrder.setId(id); + Long memberId; + try { + memberId = getMemberId(); + } catch (Exception e) { + return new ResultData(Result.ERROR,e.getMessage()); + } + wxOrder.setCUserId(memberId); + WxOrderCouponVo wxOrderCVo = wxOrderService.detailCUserVo(wxOrder); + if (wxOrderCVo == null){ + wxOrderCVo = new WxOrderCouponVo(); + wxOrderCVo.setLevel(1); + + wxOrder.setComposeOrderId(wxOrder.getId()); + wxOrder.setId(null); + List wxOrders = wxOrderService.goodsDetailCUserVo(wxOrder); + if(wxOrders != null && wxOrders.size() > 0){ + wxOrderCVo.setOrderCouponVoList(wxOrders); + + WxOrderCouponVo wxOrderCouponVo = wxOrders.get(0); + wxOrderCVo.setComposeOrderType(wxOrderCouponVo.getComposeOrderType()); + wxOrderCVo.setComposeOrderId(wxOrderCouponVo.getCouponOrderId()); + wxOrderCVo.setOrderStatus(wxOrderCouponVo.getOrderStatus()); + wxOrderCVo.setCreateDate(wxOrderCouponVo.getCreateDate()); + wxOrderCVo.setPayment(wxOrders.stream().mapToInt(o -> o.getPayment()).sum()); + + }else{ + return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); + } + }else{ + wxOrderCVo.setLevel(0); + Date now = new Date(); + if (wxOrderCVo.getValidStartDate() != null && wxOrderCVo.getValidEndDate() != null + && !wxOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())) { + if (wxOrderCVo.getValidStartDate().getTime() > now.getTime()) { + wxOrderCVo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); + } else if (wxOrderCVo.getValidEndDate().getTime() < now.getTime()) { + wxOrderCVo.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode()); + } else { + wxOrderCVo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode()); + } + } + if(wxOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode()) + && wxOrderCVo.getPickStartDate() != null && wxOrderCVo.getPickEndDate() != null){ +// wxOrderCVo.setValidStartDate(wxOrderCVo.getPickStartDate()); +// wxOrderCVo.setValidEndDate(wxOrderCVo.getPickEndDate()); + if (wxOrderCVo.getPickStartDate().getTime() > now.getTime()) { + wxOrderCVo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); + } else if (wxOrderCVo.getPickEndDate().getTime() < now.getTime()) { + wxOrderCVo.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode()); + } else { + wxOrderCVo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode()); + } + } + } + + return new ResultData(wxOrderCVo); + } + @ApiOperation(value = "根据orderId查询接口", notes = "{\"orderId\":\"string\"}") @GetMapping("/findById") @ApiImplicitParams({ diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java index 5862cff37..f9a12c6ae 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java @@ -3,6 +3,7 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.common.SortColumn; +import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -146,4 +147,11 @@ public class WxOrderCouponVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="配送信息",name="deliveryInfo") private String deliveryInfo; + + @io.swagger.annotations.ApiModelProperty(value="卷包内容",name="giftList") + private String giftList; + + @TableField(exist = false) + private List giftCouponList; + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 749e30343..d42afd661 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1748,7 +1748,15 @@ public class WxOrderServiceImpl implements WxOrderService { public WxOrderCouponVo detailCUserVo(WxOrder record) { List list = wxOrderMapper.selectDetailOfCUser(record); if (list.size() > 0) { - return list.get(0); + WxOrderCouponVo wxOrderCouponVo = list.get(0); + if(EnumCouponType.COUPON_GIFT.getCode().equals(wxOrderCouponVo.getType())){ + WxCoupon coupon = new WxCoupon(); + coupon.updateTenantInfo(wxOrderCouponVo); + List longs = JSON.parseArray(wxOrderCouponVo.getGiftList(), Long.class); + coupon.setIds(longs); + wxOrderCouponVo.setGiftCouponList(wxCouponMapper.findList(coupon)); + } + return wxOrderCouponVo; } return null; } diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 35e7db09c..a690802ac 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -264,7 +264,7 @@ o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, - c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, + c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date,c.gift_list, co.id as coupon_order_id,co.coupon_order_status,c.support_transfer,c.subsidy_num,o.compose_order_type,o.compose_order_id, o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,co.`shipping_status`,co.`delivery_info` @@ -390,6 +390,7 @@ + From c0035b4121adf674b4160ec43a57597a662d0c62 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 10 Oct 2021 11:10:33 +0800 Subject: [PATCH 03/18] update gift --- mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index a8da641c5..ce7d83423 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -392,6 +392,10 @@ and c.`use_limit_quantity` = #{useLimitQuantity} + + and c.`send_type` != 3 + + and c.`send_type` = #{sendType} From d2b5cdb98bbe6b1dbd5417676d19ff04d6ff0553 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 10 Oct 2021 15:05:00 +0800 Subject: [PATCH 04/18] update gift --- .../controller/WxCouponController.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index a88626ce3..c341d23d7 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -223,13 +223,16 @@ public class WxCouponController extends BaseController { return null; } - WxCoupon c = couponService.getById(cc.getCouponId(),cc.getTenantId()); - if (c == null) { - c = new WxCoupon(); +// WxCoupon c = couponService.getById(cc.getCouponId(),cc.getTenantId()); +// if (c == null) { +// c = new WxCoupon(); +// } + WxCouponCVo wxcv = couponService.getVoById(cc.getCouponId(),cc.getTenantId()); + if(wxcv == null){ + return null; } - - WxCouponCVo wxcv = new WxCouponCVo(); - BeanUtils.copyProperties(wxcv, c); +// WxCouponCVo wxcv = new WxCouponCVo(); +// BeanUtils.copyProperties(wxcv, c); wxcv.setId(cc.getId()); wxcv.setCouponId(cc.getCouponId()); wxcv.setTargetAd(cc.getTargetAd()); @@ -237,10 +240,10 @@ public class WxCouponController extends BaseController { wxcv.setEndTime(cc.getEndTime()); wxcv.setQrCode(cc.getQrCode()); - List chantlist = merchantService.findMerchantVoList(cc.getCouponId(),cc.getTenantId()); - if (null != chantlist && chantlist.size()>0) { - wxcv.setMerchantVoList(chantlist); - } +// List chantlist = merchantService.findMerchantVoList(cc.getCouponId(),cc.getTenantId()); +// if (null != chantlist && chantlist.size()>0) { +// wxcv.setMerchantVoList(chantlist); +// } return wxcv; } From 3cbf588c7d7da1a4c44be709bc688425e96626f2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 10 Oct 2021 15:26:49 +0800 Subject: [PATCH 05/18] update gift --- .../java/com/iformall/service/impl/WxCouponServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 76d8efbdb..9107d86e9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -341,7 +341,8 @@ public class WxCouponServiceImpl implements WxCouponService { List merchantParamList = JSONObject.parseArray(record.getMerchantParams(), JSONObject.class); //有价券判断商户是否配置了分账账号 - if (record.getSalePrice() != null && record.getSalePrice() > 0) { + if (!EnumCouponType.COUPON_GIFT.getCode().equals(record.getType()) + && record.getSalePrice() != null && record.getSalePrice() > 0) { boolean share = false; WxPayAccount payQ = new WxPayAccount(); payQ.updateTenantInfo(record); From ee5fe619e75817318ddefa73ecd53052b51143fb Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 10 Oct 2021 15:38:49 +0800 Subject: [PATCH 06/18] update gift --- .../java/com/iformall/service/impl/WxCouponServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 9107d86e9..45ab60139 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -429,7 +429,9 @@ public class WxCouponServiceImpl implements WxCouponService { } } else{ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + if (!EnumCouponType.COUPON_GIFT.getCode().equals(record.getType())){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } } if (record.getPasswordSupport() != null && record.getPasswordSupport().equals(EnumCouponPasswordSupport.SUPPORTED.getCode())) { From 4f4e183fb3c7c7bc323b4c77d64dfbd3df3c30a7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 10 Oct 2021 15:59:06 +0800 Subject: [PATCH 07/18] update gift --- .../java/com/iformall/service/impl/WxCouponServiceImpl.java | 6 ++++-- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 45ab60139..f2b602303 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -238,8 +238,10 @@ public class WxCouponServiceImpl implements WxCouponService { WxCoupon coupon = new WxCoupon(); coupon.updateTenantInfo(wxCouponCVo); List longs = JSON.parseArray(wxCouponCVo.getGiftList(), Long.class); - coupon.setIds(longs); - wxCouponCVo.setGiftCouponList(wxCouponMapper.findList(coupon)); + if(longs != null && longs.size() > 0){ + coupon.setIds(longs); + wxCouponCVo.setGiftCouponList(wxCouponMapper.findList(coupon)); + } } return wxCouponCVo; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index d42afd661..d3cae1cb0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1753,8 +1753,10 @@ public class WxOrderServiceImpl implements WxOrderService { WxCoupon coupon = new WxCoupon(); coupon.updateTenantInfo(wxOrderCouponVo); List longs = JSON.parseArray(wxOrderCouponVo.getGiftList(), Long.class); - coupon.setIds(longs); - wxOrderCouponVo.setGiftCouponList(wxCouponMapper.findList(coupon)); + if(longs != null && longs.size() > 0){ + coupon.setIds(longs); + wxOrderCouponVo.setGiftCouponList(wxCouponMapper.findList(coupon)); + } } return wxOrderCouponVo; } From 4c56a188e4636f14e3df28dba6ab73acbe57a6ca Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 10 Oct 2021 16:20:10 +0800 Subject: [PATCH 08/18] update gift --- mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index ce7d83423..ecddd81a0 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -111,7 +111,7 @@ c.`valid_type`,c.`valid_start_date`,c.`valid_end_date`,c.pick_start_date,c.pick_end_date,c.`valid_days`,c.`detail`,c.`price`,c.tail_price,c.orig_price,c.`unit`,c.`remain_inventory`,c.`inventory`, c.`remark`,c.`status`,c.`create_date`,c.`update_date`,c.`business`,c.`sub_business`,c.`support_transfer`,c.`subsidy_num`,c.`subsidy_type`, c.`press_limit_num`, c.`press_limit_hours`, c.`auto_refund`,c.`credit_price`,c.`credit_refund`,c.`put_apply_status`,c.`stock_apply_status`,c.`cancle_apply_status`, - c.`conditions`,c.approval_type,c.content_type,c.source_type,c.password_support + c.`conditions`,c.approval_type,c.content_type,c.source_type,c.password_support,c.gift_list @@ -644,6 +644,8 @@ + + Date: Sun, 10 Oct 2021 16:38:47 +0800 Subject: [PATCH 09/18] update gift --- .../com/iformall/service/impl/WxCouponChannelServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index e0e33a11c..161235503 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -293,7 +293,8 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { return vo; } - if(!isCouponMerchantValid(wxCoupon.getId(),wxCoupon.getTenantId())) { + if(!EnumCouponType.COUPON_GIFT.getCode().equals(wxCoupon.getType()) + && !isCouponMerchantValid(wxCoupon.getId(),wxCoupon.getTenantId())) { logger.debug(wxCoupon.getId()+couponid+ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage()); vo.toCouponChannnelVo(wxCoupon,channelId); vo.setErrorMsg(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage()); From 037be90c597e30302e70adfda0e0529f47fd8447 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 11 Oct 2021 11:13:13 +0800 Subject: [PATCH 10/18] update gift --- .../controller/WxCouponController.java | 87 ++++++++++--------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index c341d23d7..ffde87f9a 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -112,7 +112,7 @@ public class WxCouponController extends BaseController { //WxCouponCVo wxCouponCVo = wxCouponChannelService.findDetailVo(couponChannelIdL); WxCouponCVo wxCouponCVo = null; try { - wxCouponCVo = generateWxCouponCVoex(couponChannelIdL,getTenantInfo().getTenantId()); + wxCouponCVo = generateWxCouponCVoex(couponChannelIdL,couponIdL,getTenantInfo().getTenantId()); } catch (IllegalAccessException e) { logger.error("coupon detail fail,copyproperties error" + couponChannelId,e); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "coupon detail fail,copyproperties error" + couponChannelId); @@ -199,52 +199,57 @@ public class WxCouponController extends BaseController { } private WxCouponCVo generateWxCouponCVoForHtml(Long couponChannelIdL, Long couponIdL,String tenantId) { - WxCouponChannel cc = wxCouponChannelService.getById(couponChannelIdL,tenantId); - if (cc == null) { - return null; - } - - WxCoupon c = couponService.getHtmlById(cc.getCouponId(),cc.getTenantId()); - if (c == null) { - return null; + if(couponChannelIdL != null){ + WxCouponChannel cc = wxCouponChannelService.getById(couponChannelIdL,tenantId); + if(cc == null){ + return null; + } + WxCoupon c = couponService.getHtmlById(cc.getCouponId(),cc.getTenantId()); + if (c == null) { + return null; + } + WxCouponCVo couponCVo = new WxCouponCVo(); + couponCVo.setId(cc.getId()); + couponCVo.setCouponId(cc.getCouponId()); + couponCVo.setHtml(c.getHtml()); + return couponCVo; + }else if(couponIdL != null){ + WxCoupon c = couponService.getHtmlById(couponIdL,tenantId); + if (c == null) { + return null; + } + WxCouponCVo couponCVo = new WxCouponCVo(); + couponCVo.setCouponId(c.getId()); + couponCVo.setHtml(c.getHtml()); + return couponCVo; } + return null; - WxCouponCVo couponCVo = new WxCouponCVo(); - couponCVo.setId(cc.getId()); - couponCVo.setCouponId(cc.getCouponId()); - couponCVo.setHtml(c.getHtml()); - return couponCVo; } - private WxCouponCVo generateWxCouponCVoex(Long couponChannelIdL,String tenantId) throws IllegalAccessException, InvocationTargetException { - WxCouponChannel cc = wxCouponChannelService.getById(couponChannelIdL,tenantId); - if (cc == null) { - return null; - } - -// WxCoupon c = couponService.getById(cc.getCouponId(),cc.getTenantId()); -// if (c == null) { -// c = new WxCoupon(); -// } - WxCouponCVo wxcv = couponService.getVoById(cc.getCouponId(),cc.getTenantId()); - if(wxcv == null){ - return null; + private WxCouponCVo generateWxCouponCVoex(Long couponChannelIdL,Long couponIdL,String tenantId) throws IllegalAccessException, InvocationTargetException { + if(couponChannelIdL != null){ + WxCouponChannel cc = wxCouponChannelService.getById(couponChannelIdL,tenantId); + if(cc == null){ + return null; + } + WxCouponCVo wxcv = couponService.getVoById(cc.getCouponId(),tenantId); + if(wxcv == null){ + return null; + } + wxcv.setId(cc.getId()); + wxcv.setCouponId(cc.getCouponId()); + wxcv.setTargetAd(cc.getTargetAd()); + wxcv.setBeginTime(cc.getBeginTime()); + wxcv.setEndTime(cc.getEndTime()); + wxcv.setQrCode(cc.getQrCode()); + return wxcv; + }else if(couponIdL != null){ + WxCouponCVo wxcv = couponService.getVoById(couponIdL,tenantId); + return wxcv; } -// WxCouponCVo wxcv = new WxCouponCVo(); -// BeanUtils.copyProperties(wxcv, c); - wxcv.setId(cc.getId()); - wxcv.setCouponId(cc.getCouponId()); - wxcv.setTargetAd(cc.getTargetAd()); - wxcv.setBeginTime(cc.getBeginTime()); - wxcv.setEndTime(cc.getEndTime()); - wxcv.setQrCode(cc.getQrCode()); - -// List chantlist = merchantService.findMerchantVoList(cc.getCouponId(),cc.getTenantId()); -// if (null != chantlist && chantlist.size()>0) { -// wxcv.setMerchantVoList(chantlist); -// } - return wxcv; + return null; } private void updateActivityStatus(WxCouponCVo wxCouponCVo) { From c09675172686c421979576b5b7cb7330e5723eaa Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 11 Oct 2021 14:09:21 +0800 Subject: [PATCH 11/18] update gift --- .../java/com/iformall/controller/WxCouponController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index ffde87f9a..912b7bd29 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -62,7 +62,8 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "couponChannelId", value = "couponChannelId", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "couponId", value = "couponId", dataType = "String", paramType = "query", required = false)}) public ResultData detailC(String couponChannelId, String couponId) { - if (StringUtils.isBlank(couponChannelId) || couponChannelId.equalsIgnoreCase(Constant.UNDEFINED)) { + if ((StringUtils.isBlank(couponChannelId) || couponChannelId.equalsIgnoreCase(Constant.UNDEFINED)) + || (StringUtils.isBlank(couponId) || couponId.equalsIgnoreCase(Constant.UNDEFINED))) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId/couponId为空"); } Long couponChannelIdL = 0L, couponIdL = 0L; @@ -138,7 +139,8 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "couponChannelId", value = "couponChannelId", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "couponId", value = "couponId", dataType = "String", paramType = "query", required = false)}) public ResultData getHtml(String couponChannelId, String couponId) { - if (StringUtils.isBlank(couponChannelId) || couponChannelId.equalsIgnoreCase(Constant.UNDEFINED)) { + if (StringUtils.isBlank(couponChannelId) || couponChannelId.equalsIgnoreCase(Constant.UNDEFINED) + || (StringUtils.isBlank(couponId) || couponId.equalsIgnoreCase(Constant.UNDEFINED))) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId/couponId为空"); } Long couponChannelIdL = 0L, couponIdL = 0L; From a680aac7754fde5832babc89e207b6caa8a0db75 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 11 Oct 2021 14:15:02 +0800 Subject: [PATCH 12/18] update gift --- .../main/java/com/iformall/controller/WxCouponController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 912b7bd29..a0d42f058 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -63,7 +63,7 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "couponId", value = "couponId", dataType = "String", paramType = "query", required = false)}) public ResultData detailC(String couponChannelId, String couponId) { if ((StringUtils.isBlank(couponChannelId) || couponChannelId.equalsIgnoreCase(Constant.UNDEFINED)) - || (StringUtils.isBlank(couponId) || couponId.equalsIgnoreCase(Constant.UNDEFINED))) { + && (StringUtils.isBlank(couponId) || couponId.equalsIgnoreCase(Constant.UNDEFINED))) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId/couponId为空"); } Long couponChannelIdL = 0L, couponIdL = 0L; @@ -140,7 +140,7 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "couponId", value = "couponId", dataType = "String", paramType = "query", required = false)}) public ResultData getHtml(String couponChannelId, String couponId) { if (StringUtils.isBlank(couponChannelId) || couponChannelId.equalsIgnoreCase(Constant.UNDEFINED) - || (StringUtils.isBlank(couponId) || couponId.equalsIgnoreCase(Constant.UNDEFINED))) { + && (StringUtils.isBlank(couponId) || couponId.equalsIgnoreCase(Constant.UNDEFINED))) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId/couponId为空"); } Long couponChannelIdL = 0L, couponIdL = 0L; From d4900fa4095d38ea3c2bbc27073148cb5b9a4e2a Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 11 Oct 2021 14:29:58 +0800 Subject: [PATCH 13/18] update gift --- .../controller/market/WxCouponController.java | 5 +++++ .../controller/WxCouponController.java | 22 ++++++++++++------- .../java/com/iformall/domain/po/WxCoupon.java | 3 +++ .../main/resources/mapper/WxCouponMapper.xml | 11 ++++++---- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index d9bc3a260..fb90e20f5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -87,6 +87,11 @@ public class WxCouponController extends BaseController { EnumCouponType.COUPON_MULTIMCH.getCode()}; wxCoupon.setTypes(Arrays.asList(typeArray)); + + Integer[] sendTypeArray = { + EnumCouponSendType.ACTIVE.getCode(), + EnumCouponSendType.PASSIVE.getCode(),}; + wxCoupon.setSendTypes(Arrays.asList(sendTypeArray)); } return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index a0d42f058..598bc0735 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -67,9 +67,12 @@ public class WxCouponController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId/couponId为空"); } Long couponChannelIdL = 0L, couponIdL = 0L; + try { - couponChannelIdL = Long.valueOf(couponChannelId); - if (StringUtils.isNotBlank(couponId) && !couponId.equalsIgnoreCase(Constant.UNDEFINED)) { + if (StringUtils.isNotBlank(couponChannelId) && !couponChannelId.equalsIgnoreCase(Constant.UNDEFINED)) { + couponChannelIdL = Long.valueOf(couponChannelId); + } + if (!StringUtils.isNotBlank(couponId) && !couponId.equalsIgnoreCase(Constant.UNDEFINED)) { couponIdL = Long.valueOf(couponId); } } catch (NumberFormatException e) { @@ -144,9 +147,12 @@ public class WxCouponController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId/couponId为空"); } Long couponChannelIdL = 0L, couponIdL = 0L; + try { - couponChannelIdL = Long.valueOf(couponChannelId); - if (StringUtils.isNotBlank(couponId) && !couponId.equalsIgnoreCase(Constant.UNDEFINED)) { + if (StringUtils.isNotBlank(couponChannelId) && !couponChannelId.equalsIgnoreCase(Constant.UNDEFINED)) { + couponChannelIdL = Long.valueOf(couponChannelId); + } + if (!StringUtils.isNotBlank(couponId) && !couponId.equalsIgnoreCase(Constant.UNDEFINED)) { couponIdL = Long.valueOf(couponId); } } catch (NumberFormatException e) { @@ -201,7 +207,7 @@ public class WxCouponController extends BaseController { } private WxCouponCVo generateWxCouponCVoForHtml(Long couponChannelIdL, Long couponIdL,String tenantId) { - if(couponChannelIdL != null){ + if(couponChannelIdL > 0l){ WxCouponChannel cc = wxCouponChannelService.getById(couponChannelIdL,tenantId); if(cc == null){ return null; @@ -215,7 +221,7 @@ public class WxCouponController extends BaseController { couponCVo.setCouponId(cc.getCouponId()); couponCVo.setHtml(c.getHtml()); return couponCVo; - }else if(couponIdL != null){ + }else if(couponIdL > 0l){ WxCoupon c = couponService.getHtmlById(couponIdL,tenantId); if (c == null) { return null; @@ -231,7 +237,7 @@ public class WxCouponController extends BaseController { private WxCouponCVo generateWxCouponCVoex(Long couponChannelIdL,Long couponIdL,String tenantId) throws IllegalAccessException, InvocationTargetException { - if(couponChannelIdL != null){ + if(couponChannelIdL > 0l){ WxCouponChannel cc = wxCouponChannelService.getById(couponChannelIdL,tenantId); if(cc == null){ return null; @@ -247,7 +253,7 @@ public class WxCouponController extends BaseController { wxcv.setEndTime(cc.getEndTime()); wxcv.setQrCode(cc.getQrCode()); return wxcv; - }else if(couponIdL != null){ + }else if(couponIdL > 0l){ WxCouponCVo wxcv = couponService.getVoById(couponIdL,tenantId); return wxcv; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index cc3535096..1a0c2d0fb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -29,6 +29,9 @@ public class WxCoupon extends TenantEntity { @TableField(exist = false) protected List types; + @TableField(exist = false) + protected List sendTypes; + @TableField(exist = false) protected List notinTypes; diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index ecddd81a0..dc170bb31 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -392,10 +392,6 @@ and c.`use_limit_quantity` = #{useLimitQuantity} - - and c.`send_type` != 3 - - and c.`send_type` = #{sendType} @@ -577,6 +573,13 @@ + + and c.send_types in + + #{typesItem} + + + order by ${sortColumns} From 3831fda59a41f01a969cfd4ded54b6f65db4406e Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 11 Oct 2021 14:35:22 +0800 Subject: [PATCH 14/18] update gift --- .../main/java/com/iformall/controller/WxCouponController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 598bc0735..e61bea376 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -72,7 +72,7 @@ public class WxCouponController extends BaseController { if (StringUtils.isNotBlank(couponChannelId) && !couponChannelId.equalsIgnoreCase(Constant.UNDEFINED)) { couponChannelIdL = Long.valueOf(couponChannelId); } - if (!StringUtils.isNotBlank(couponId) && !couponId.equalsIgnoreCase(Constant.UNDEFINED)) { + if (StringUtils.isNotBlank(couponId) && !couponId.equalsIgnoreCase(Constant.UNDEFINED)) { couponIdL = Long.valueOf(couponId); } } catch (NumberFormatException e) { @@ -152,7 +152,7 @@ public class WxCouponController extends BaseController { if (StringUtils.isNotBlank(couponChannelId) && !couponChannelId.equalsIgnoreCase(Constant.UNDEFINED)) { couponChannelIdL = Long.valueOf(couponChannelId); } - if (!StringUtils.isNotBlank(couponId) && !couponId.equalsIgnoreCase(Constant.UNDEFINED)) { + if (StringUtils.isNotBlank(couponId) && !couponId.equalsIgnoreCase(Constant.UNDEFINED)) { couponIdL = Long.valueOf(couponId); } } catch (NumberFormatException e) { From 5a7b65f33758aec1e2602901742da9112c030980 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 11 Oct 2021 14:42:26 +0800 Subject: [PATCH 15/18] update gift --- .../java/com/iformall/service/impl/WxCouponServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index f2b602303..40789d641 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -227,6 +227,9 @@ public class WxCouponServiceImpl implements WxCouponService { @Override public WxCouponCVo getVoById(Long id,String tenantId) { WxCouponCVo wxCouponCVo = wxCouponMapper.findVoDetail(id,tenantId); + if(wxCouponCVo == null){ + return null; + } List merchantList = wxCouponCVo.getMerchantVoList(); if (merchantList != null) { merchantList = merchantList.stream().filter( From c50ee173e6f8e7ffc644d93c61cb0d3ad6f0bca7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 11 Oct 2021 15:40:59 +0800 Subject: [PATCH 16/18] update gift --- .../com/iformall/controller/market/WxCouponController.java | 6 +++++- mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index fb90e20f5..e12aa78af 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -62,7 +62,7 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "券投放-列表") - public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Integer dataType) { + public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Integer dataType,Boolean isList) { logger.debug("[" + getIpAddr() + "] WxCouponController::list"); if (wxCoupon == null) wxCoupon = new WxCoupon(); if(null != dataType && dataType == 1){ @@ -88,11 +88,15 @@ public class WxCouponController extends BaseController { wxCoupon.setTypes(Arrays.asList(typeArray)); + } + + if(!(isList == null?false:isList)){ Integer[] sendTypeArray = { EnumCouponSendType.ACTIVE.getCode(), EnumCouponSendType.PASSIVE.getCode(),}; wxCoupon.setSendTypes(Arrays.asList(sendTypeArray)); } + return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index dc170bb31..d9204ba8f 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -574,7 +574,7 @@ - and c.send_types in + and c.send_type in #{typesItem} From cbee4bb3af2ef0027b7fc6370cda6ec57a840f63 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 11 Oct 2021 15:45:36 +0800 Subject: [PATCH 17/18] update gift --- mallinkService/src/main/resources/mapper/WxOrderMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index a690802ac..85b3097e7 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -465,7 +465,7 @@ o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address` from wx_coupon c,wx_order o where o.product_id = c.id and o.order_status in (0,2) - and o.compose_order_type in (0,3) + and o.compose_order_type = 0 and o.compose_order_id = 0 and o.c_user_id = #{cUserId} @@ -510,7 +510,7 @@ null ,null ,null ,null from wx_order o where o.order_status in (0,2) - and o.compose_order_type in (1,2) + and o.compose_order_type in (1,2,3) and o.compose_order_id > 0 and o.c_user_id = #{cUserId} From 411d934f2ead26c2b691033731ddf7a376cea86c Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 11 Oct 2021 16:14:08 +0800 Subject: [PATCH 18/18] update gift --- mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index d9204ba8f..43475cea0 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -357,7 +357,8 @@ - and ( c.`type` < 7 or c.`type` = 10 ) + + and c.`type` in (1,2,3,4,5,6,10,11,12)