From 7e8b5ab056bf199fd0918fc4a45452c021e6796a Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 8 Jan 2019 11:32:48 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF=E6=94=B6=E6=AC=BE=E7=A0=81=E5=8A=A0?= =?UTF-8?q?=E5=AF=86][=E4=BF=AE=E6=94=B9]:=E6=94=B6=E6=AC=BE=E7=A0=81?= =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantBUserController.java | 10 +++++ .../controller/WxCardPayController.java | 16 +++---- .../iformall/controller/WxMallController.java | 4 +- .../controller/WxMerchantController.java | 43 +++++++++++++++++++ .../domain/vo/WxMerchantDiscountVo.java | 38 ---------------- .../com/iformall/mapper/WxMerchantMapper.java | 6 ++- .../iformall/service/WxMerchantService.java | 13 +++++- .../service/impl/WxMerchantServiceImpl.java | 8 +++- .../java/com/iformall/utils/HashUtil.java | 23 ++++++++++ .../resources/mapper/WxMerchantMapper.xml | 23 +++++++++- 10 files changed, 129 insertions(+), 55 deletions(-) create mode 100644 mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java delete mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantDiscountVo.java diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 82402f61f..4cc5cedf8 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -10,6 +10,7 @@ import com.iformall.enums.EnumMerchantBUserStatus; import com.iformall.enums.EnumMerchantStatus; import com.iformall.interceptor.AuthorizationInterceptor; import com.iformall.service.*; +import com.iformall.utils.HashUtil; import com.iformall.utils.IPUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -81,6 +82,15 @@ public class WxMerchantBUserController extends BaseController { resultMap.put("service_phone", mall.getServicePhone()); resultMap.put("tenant_id",merchant.getTenantId()); resultMap.put("merchant_id",merchant.getId()); + String mid = null; + try { + mid = String.valueOf(merchant.getId()); + if(mid != null) { + resultMap.put("merchant_id_scan", HashUtil.EncoderByMd5(mid)); + } + }catch (Exception e) { + logger.error(e.getMessage()); + } return new ResultData(resultMap); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 0ea1d9a73..32fffeb88 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -45,22 +45,22 @@ public class WxCardPayController extends BaseController { @Autowired WxCardSpendService wxCardSpendService; - @ApiOperation(value = "C端扫B端储值卡支付订单", notes = "params:{\"cardId\":\"String\",\"merchantCode\":\"String\",\"totalFee\":\"String(元)\"}") + @ApiOperation(value = "C端扫B端储值卡支付订单", notes = "params:{\"cardId\":\"String\",\"merchantId\":\"String\",\"totalFee\":\"String(元)\"}") @PostMapping("order_create") public ResultData saveCardPayOrder(@RequestBody Map paramMap, HttpServletRequest request) { String ipStr = getIpAddr(); logger.info("saveCardPayOrder: " + ipStr + " :" + paramMap.toString()); String cardIdStr = paramMap.get("cardId"); - String merchantCode = paramMap.get("merchantCode"); + String merchantStr = paramMap.get("merchantId"); String totalFeeStr = paramMap.get("totalFee"); if (StringUtils.isBlank(cardIdStr)) { logger.error("cardId不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cardId不能为空"); } - if (StringUtils.isBlank(merchantCode)) { - logger.error("merchantCode不能为空"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "merchantCode不能为空"); + if (StringUtils.isBlank(merchantStr)) { + logger.error("merchantId不能为空"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "merchantId不能为空"); } if (StringUtils.isBlank(totalFeeStr)) { logger.error("totalFee不能为空"); @@ -76,10 +76,10 @@ public class WxCardPayController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cardIdStr转换失败"); } try { - merchantId = Long.valueOf(merchantCode); + merchantId = Long.valueOf(merchantStr); } catch (Exception e) { - logger.error("merchantCode convert failed:" + merchantCode); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "merchantCode转换失败"); + logger.error("merchantCode convert failed:" + merchantStr); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "merchantId转换失败"); } BigDecimal totalFee = new BigDecimal(totalFeeStr); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java index 09ac2e7f4..040198b89 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java @@ -5,7 +5,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; -import com.iformall.domain.vo.WxMerchantDiscountVo; +import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.*; import io.swagger.annotations.Api; @@ -123,7 +123,7 @@ public class WxMallController extends BaseController { WxMerchant merchantQ = new WxMerchant(); merchantQ.setTenantId(user.getTenantId()); merchantQ.setStatus(EnumMerchantStatus.VALID.getCode()); - List list = wxMerchantService.getDisCountList(merchantQ); + List list = wxMerchantService.getDisCountList(merchantQ); return new ResultData(Result.SUCCESS, "查询成功", list); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java new file mode 100644 index 000000000..c3f2d7ff2 --- /dev/null +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -0,0 +1,43 @@ +package com.iformall.controller; + +import com.iformall.common.ErrorCode; +import com.iformall.common.ResultData; +import com.iformall.domain.vo.WxMerchantVo; +import com.iformall.service.WxMerchantService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; + +/** + * @author Stormeye + */ +@RestController +@RequestMapping("wxMerchant") +public class WxMerchantController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxMerchantService wxMerchantService; + + + @ApiOperation("根据code查询接口") + @GetMapping("/findByCode") + @ApiImplicitParam(name = "merchantCode", value = "merchantCode", dataType = "String", paramType = "query", required = true) + public ResultData findByCode(String merchantCode) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::findByCode"); + if(merchantCode == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + HashMap params = new HashMap(); + params.put("tenantId", getTenantId()); + params.put("merchantCode", merchantCode); + WxMerchantVo wxMerchant = wxMerchantService.getMerchantInfo(params); + return new ResultData(wxMerchant); + } + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantDiscountVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantDiscountVo.java deleted file mode 100644 index 366ebaf95..000000000 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantDiscountVo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.iformall.domain.vo; - -public class WxMerchantDiscountVo extends WxMerchantVo { - private static final long serialVersionUID = 6687964942922444531L; - - @io.swagger.annotations.ApiModelProperty(value="VIP折扣率1",name="vipDiscountRate1") - private Integer vipDiscountRate1; - - @io.swagger.annotations.ApiModelProperty(value="VIP折扣率2",name="vipDiscountRate2") - private Integer vipDiscountRate2; - - @io.swagger.annotations.ApiModelProperty(value="VIP折扣率3",name="vipDiscountRate3") - private Integer vipDiscountRate3; - - public Integer getVipDiscountRate1() { - return vipDiscountRate1; - } - - public void setVipDiscountRate1(Integer vipDiscountRate1) { - this.vipDiscountRate1 = vipDiscountRate1; - } - - public Integer getVipDiscountRate2() { - return vipDiscountRate2; - } - - public void setVipDiscountRate2(Integer vipDiscountRate2) { - this.vipDiscountRate2 = vipDiscountRate2; - } - - public Integer getVipDiscountRate3() { - return vipDiscountRate3; - } - - public void setVipDiscountRate3(Integer vipDiscountRate3) { - this.vipDiscountRate3 = vipDiscountRate3; - } -} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 62824a57f..1a53acbfa 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -3,13 +3,15 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.vo.WxMerchantDiscountVo; +import com.iformall.domain.vo.WxMerchantVo; public interface WxMerchantMapper extends CommonMapper { List findList(WxMerchant wxMerchant); - List findDiscountList(WxMerchant wxMerchant); + List findDiscountList(WxMerchant wxMerchant); + + WxMerchantVo getMerchantByCode(HashMap params); diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 2432514e0..b28564305 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -3,8 +3,9 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.vo.WxMerchantDiscountVo; +import com.iformall.domain.vo.WxMerchantVo; +import java.util.HashMap; import java.util.List; /** @@ -28,7 +29,15 @@ public interface WxMerchantService { * @param record * @return */ - List getDisCountList(WxMerchant record); + List getDisCountList(WxMerchant record); + + /** + * 根据code查询 + * + * @param params + * @return + */ + WxMerchantVo getMerchantInfo(HashMap params); /** * 根据实体查询分页列表 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 1f7c7ee90..dcafa63c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -7,7 +7,6 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; -import com.iformall.domain.vo.WxMerchantDiscountVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -102,10 +101,15 @@ public class WxMerchantServiceImpl implements WxMerchantService { } @Override - public List getDisCountList(WxMerchant record) { + public List getDisCountList(WxMerchant record) { return wxMerchantMapper.findDiscountList(record); } + @Override + public WxMerchantVo getMerchantInfo(HashMap params) { + return wxMerchantMapper.getMerchantByCode(params); + } + @Override public List etcpList(WxMerchant record) { record.setCarVendorType(EnumCarVendor.CAR_ETCP.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/utils/HashUtil.java b/mallinkService/src/main/java/com/iformall/utils/HashUtil.java index 62e11d599..4d99d09ed 100644 --- a/mallinkService/src/main/java/com/iformall/utils/HashUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/HashUtil.java @@ -1,6 +1,8 @@ package com.iformall.utils; +import java.io.UnsupportedEncodingException; import java.security.MessageDigest; +import java.util.Base64; /** * @author Stormeye @@ -82,4 +84,25 @@ public class HashUtil { } return diff == 0; } + + public static String EncoderByMd5(String str) { + if (str == null) { + return null; + } + try { + String enc = hash("md5", str); + enc = new String(Base64.getUrlEncoder().encode(enc.getBytes("utf-8"))); + return enc; + } catch (UnsupportedEncodingException e) { + return null; + } + } + + public static String DecodeByMD5(String str) { + if (str == null) { + return null; + } + String dec = new String(Base64.getUrlDecoder().decode(str)); + return dec; + } } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 13f16540e..ea13f8152 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -98,7 +98,7 @@ m.vip_discount_rate1, m.vip_discount_rate2, m.vip_discount_rate3 - + @@ -135,5 +135,26 @@ + +