From 7bcdc5d2824b32eb0f45a61447ec22031796b439 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Tue, 23 Apr 2019 19:46:14 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E6=B6=88=E8=B4=B9=E5=95=86?= =?UTF-8?q?=E6=88=B7=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/vo/WxCreditHistoryVo.java | 3 ++ .../com/iformall/enums/EnumMerchantType.java | 32 +++++++++++++++++++ .../impl/WxCreditHistoryServiceImpl.java | 8 ++--- .../service/impl/WxOrderServiceImpl.java | 14 +++++++- .../mapper/WxCreditHistoryMapper.xml | 3 +- 5 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumMerchantType.java diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java index 16a56902a..a238bf606 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java @@ -52,4 +52,7 @@ public class WxCreditHistoryVo { @io.swagger.annotations.ApiModelProperty(value="操作人",name="operator") private String operator; + @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") + private Long merchantId; + } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantType.java b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantType.java new file mode 100644 index 000000000..0dcf5786f --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantType.java @@ -0,0 +1,32 @@ +package com.iformall.enums; + +public enum EnumMerchantType { + + MERCHANT_MORE(-1, "多商户") + ; + + public static EnumMerchantType getEnum(Integer code) { + for (EnumMerchantType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumMerchantType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 8f21e031b..5b03c2c0b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -10,10 +10,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCreditHistoryVo; -import com.iformall.enums.EnumBusiness; -import com.iformall.enums.EnumScoreRules; -import com.iformall.enums.EnumScoreType; -import com.iformall.enums.EnumUserType; +import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.WxCreditHistoryService; @@ -141,6 +138,9 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } }); } + if (Long.valueOf(EnumMerchantType.MERCHANT_MORE.getCode()).equals(credit.getMerchantId())) { + credit.setMerchantName(EnumMerchantType.MERCHANT_MORE.getMessage()); + } } return new PageInfo<>(wxCreditHistoryVoList); } 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 872be219e..10aa91d13 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -968,7 +968,19 @@ public class WxOrderServiceImpl implements WxOrderService { creditHistory.setCouponId(coupon.getId()); creditHistory.setBusinessId(Long.valueOf(coupon.getBusiness())); creditHistory.setSpend(updateOrder.getPayment()); - //creditHistory.setMerchantId(wxMerchant.getId()); + //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 + WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); + wxCouponMerchant.setProductId(coupon.getId()); + wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); + List list = wxCouponMerchantMapper.findList(wxCouponMerchant); + if (list != null && list.size() > 0) { + if (list.size() == 1) { + creditHistory.setMerchantId(list.get(0).getMerchantId()); + } + if (list.size() > 1) { + creditHistory.setMerchantId(Long.valueOf(EnumMerchantType.MERCHANT_MORE.getCode())); + } + } wxCreditHistoryService.saveOrUpdate(creditHistory); } catch (Exception e) { logger.error("积分值:" + e.getMessage()); diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index 20c2a9e15..3a07000ce 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -124,7 +124,8 @@ credit.receipt_url receiptUrl, credit.operator_type operatorType, credit.operator_id operatorId, - merchant.NAME merchantName + merchant.NAME merchantName, + credit.merchant_id merchantId FROM wx_c_user_basic_info basic INNER JOIN wx_credit_history credit ON basic.id = credit.c_user_id