From 5cc5a85a2b74a37f433fd32daf5a06889361644d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 21 Sep 2019 14:22:29 +0800 Subject: [PATCH 1/8] =?UTF-8?q?[=E5=81=9C=E8=BD=A6][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=88=B8=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxCarController.java | 128 ++++++++---------- 1 file changed, 57 insertions(+), 71 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 59a030c5e..e8fd6799a 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -660,48 +660,6 @@ public class WxCarController extends BaseController { } } - /** - * 停车费抵扣 - * - */ - @ApiOperation(value = "停车费抵扣", notes ="TJD: {\"tradeId\":\"string\",\"accountId\":\"string\",\"couponOrderId\":\"string\"}") - @PostMapping("/deductionFee") - public ResultData deductionFee(@RequestBody Map paramMap) { - /// 1, get mall's park - WxPark park = getCurrentPark(getTenantId()); - if (park.getVendorType() == EnumCarVendor.CAR_TJD.getCode()) { - String tradeId = paramMap.get("tradeId"); - String accountId = paramMap.get("accountId"); - String outTradeNo = paramMap.get("couponOrderId"); - if (StringUtils.isBlank(tradeId)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "tradeId为空"); - } - if (StringUtils.isBlank(accountId)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "accountId为空"); - } - if (StringUtils.isBlank(outTradeNo)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponOrderId为空"); - } - WxCouponOrder couponOrder = wxCouponOrderService.getById(Long.valueOf(outTradeNo)); - WxCoupon coupon = couponService.getById(couponOrder.getCouponId()); - String params = park.getVendorParams(); - JSONObject objParams = JSON.parseObject(params); - String url = objParams.getString("url"); - String partner = objParams.getString("partner"); - String key = objParams.getString("key"); - String version = objParams.getString("version"); - String ret = tjd.deductionForDetail(url, partner, key, version, - tradeId, accountId, couponOrder, coupon); - JSONObject retObj = JSON.parseObject(ret); - if (retObj.getString(TJDUtil.TJD_RETURN_CODE).equalsIgnoreCase(EnumTJDCode.SUCCESS.getMessage())) { - return new ResultData(); - } else { - return new ResultData(ErrorCode.TJD_DEDUCE_FEE_FAIL.getCode(), "停车费抵扣失败"); - } - } - return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "停车费抵扣失败"); - } - private String getETCPBusinessID(Long merchantId) { String businessId; WxMerchant wxMerchant = wxMerchantService.getById(merchantId); @@ -715,44 +673,44 @@ public class WxCarController extends BaseController { * 优免券领取 * 优免券不可退 */ - @ApiOperation(value = "优免券领取", notes="ETCP:={\"etcpToken\":\"string\",\"carNumber\":\"string\",\"couponOrderId\"=\"String\"},输出\n{}") + @ApiOperation(value = "停车券使用", notes="ETCP:={\"etcpToken\":\"string(ETCP专用)\",\"carNumber\":\"string\",\"couponOrderId\"=\"String\"},输出\n{}\n" + + "TJD:{\"carNumber\":\"string\",\"tradeId\":\"string\",\"accountId\":\"string\",\"couponOrderId\":\"string\"}") @PostMapping("/getCoupon") public ResultData getCoupon(@RequestBody Map paramMap) { /// 1, get mall's park WxPark park = getCurrentPark(getTenantId()); + String carNumber = paramMap.get("carNumber"); + String couponOrderIdStr = paramMap.get("couponOrderId"); + if (StringUtils.isBlank(carNumber)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "carNumber为空"); + } + if (StringUtils.isBlank(couponOrderIdStr)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponOrderId为空"); + } + Long couponOrderId = 0L; + try { + couponOrderId = Long.valueOf(couponOrderIdStr); + } catch (NumberFormatException e) { + logger.error(e.getMessage()); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponOrderId转化失败"); + } + + WxCouponOrderCarCVo userCar = null; + WxCouponOrder userCarQ = new WxCouponOrder(); + userCarQ.setTenantId(getTenantId()); + userCarQ.setCUserId(getUserId()); + userCarQ.setId(couponOrderId); + userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); + List list = wxCouponOrderService.carListCUserVo(userCarQ); + if (list.size() > 0) { + userCar = list.get(0); + } + if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { String etcpToken = paramMap.get("etcpToken"); - String carNumber = paramMap.get("carNumber"); - String couponOrderIdStr = paramMap.get("couponOrderId"); if (StringUtils.isBlank(etcpToken)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "etcpToken为空"); } - if (StringUtils.isBlank(carNumber)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "carNumber为空"); - } - if (StringUtils.isBlank(couponOrderIdStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponOrderId为空"); - } - - Long couponOrderId = 0L; - try { - couponOrderId = Long.valueOf(couponOrderIdStr); - } catch (NumberFormatException e) { - logger.error(e.getMessage()); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponOrderId转化失败"); - } - - WxCouponOrderCarCVo userCar = null; - WxCouponOrder userCarQ = new WxCouponOrder(); - userCarQ.setTenantId(getTenantId()); - userCarQ.setCUserId(getUserId()); - userCarQ.setId(couponOrderId); - userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); - List list = wxCouponOrderService.carListCUserVo(userCarQ); - if (list.size() > 0) { - userCar = list.get(0); - } - String params = park.getVendorParams(); JSONObject objParams = JSON.parseObject(params); String url = objParams.getString("url"); @@ -800,6 +758,34 @@ public class WxCarController extends BaseController { } else { return new ResultData(ErrorCode.ETCP_QUAN_SEND_FAIL.getCode(), retObj.getString("message")); } + } else if (park.getVendorType() == EnumCarVendor.CAR_TJD.getCode()){ + String tradeId = paramMap.get("tradeId"); + String accountId = paramMap.get("accountId"); + if (StringUtils.isBlank(tradeId)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "tradeId为空"); + } + if (StringUtils.isBlank(accountId)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "accountId为空"); + } + WxCoupon coupon = couponService.getById(userCar.getCouponId()); + if (coupon == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券为空"); + } + String params = park.getVendorParams(); + JSONObject objParams = JSON.parseObject(params); + String url = objParams.getString(TJDUtil.TJD_URL); + String partner = objParams.getString(TJDUtil.TJD_ACCOUNT); + String key = objParams.getString(TJDUtil.TJD_ACCOUNT_KEY); + String version = objParams.getString(TJDUtil.TJD_VERSION); + + String ret = tjd.deductionForDetail(url, partner, key, version, + tradeId, accountId, userCar, coupon); + JSONObject retObj = JSON.parseObject(ret); + if (retObj.getString(TJDUtil.TJD_RETURN_CODE).equalsIgnoreCase(EnumTJDCode.SUCCESS.getMessage())) { + return new ResultData(); + } else { + return new ResultData(ErrorCode.TJD_DEDUCE_FEE_FAIL.getCode(), "停车费抵扣失败"); + } } return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "优免券领取失败"); } From 0cf96769c5ded5ff33e99a57d05a9869fcfd9e33 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 21 Sep 2019 15:23:16 +0800 Subject: [PATCH 2/8] =?UTF-8?q?[=E5=8D=A1=E5=AF=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E5=8D=A1=E9=A2=91=E9=81=93=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=85=8D=E8=B4=B9=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponChannelController.java | 11 +++++------ .../java/com/iformall/domain/po/WxCouponChannel.java | 4 ++++ .../main/resources/mapper/WxCouponChannelMapper.xml | 3 +++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index cfa4b8594..0bcdd11dd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -9,12 +9,8 @@ import com.iformall.controller.app.WxAppinfoController; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCouponChannelDto; import com.iformall.domain.po.*; -import com.iformall.domain.vo.WxCouponChannelAddVo; import com.iformall.domain.vo.WxCouponChannelVo; -import com.iformall.enums.EnumCouponChannelStatus; -import com.iformall.enums.EnumFlowRecordStatus; -import com.iformall.enums.EnumRentContractAppStatus; -import com.iformall.enums.EnumRentContractStatus; +import com.iformall.enums.*; import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.service.QrCodeService; import com.iformall.service.WxCouponChannelService; @@ -24,7 +20,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -66,6 +61,10 @@ public class WxCouponChannelController extends BaseController { if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) { wxCouponChannel.setStatus(null); } + if (wxCouponChannel.getTargetAd() != null && wxCouponChannel.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode())) { + // 卡频道过滤掉免费卡 + wxCouponChannel.setSendType(EnumCouponSendType.ACTIVE.getCode()); + } wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index ecb7e890f..ef3fda066 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -73,6 +73,10 @@ public class WxCouponChannel extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") private Integer creditPrice; + @Transient + @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放,用于卡购物频道",name="sendType") + private Integer sendType; + @Transient @SortColumn(column = "sale_price") private String salePriceStr; diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 282ec1180..9d9b6224d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -25,6 +25,9 @@ where 1=1 + + and c.send_type = #{sendType} + and c.status = #{couponStatus} From 306ef0432035c3fcb604c21b27d80c685ef7dc81 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 21 Sep 2019 16:08:01 +0800 Subject: [PATCH 3/8] =?UTF-8?q?[=E5=8D=A1=E5=AF=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E5=8D=A1=E9=A2=91=E9=81=93=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=85=8D=E8=B4=B9=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/market/WxCouponChannelController.java | 4 ---- .../src/main/java/com/iformall/domain/po/WxCouponChannel.java | 4 ---- .../src/main/resources/mapper/WxCouponChannelMapper.xml | 3 --- 3 files changed, 11 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index 0bcdd11dd..f68ff413e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -61,10 +61,6 @@ public class WxCouponChannelController extends BaseController { if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) { wxCouponChannel.setStatus(null); } - if (wxCouponChannel.getTargetAd() != null && wxCouponChannel.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode())) { - // 卡频道过滤掉免费卡 - wxCouponChannel.setSendType(EnumCouponSendType.ACTIVE.getCode()); - } wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index ef3fda066..ecb7e890f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -73,10 +73,6 @@ public class WxCouponChannel extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") private Integer creditPrice; - @Transient - @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放,用于卡购物频道",name="sendType") - private Integer sendType; - @Transient @SortColumn(column = "sale_price") private String salePriceStr; diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 9d9b6224d..282ec1180 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -25,9 +25,6 @@ where 1=1 - - and c.send_type = #{sendType} - and c.status = #{couponStatus} From 7401f869206ffe9f1b248522c0f1116e41a4b4a7 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 21 Sep 2019 16:31:49 +0800 Subject: [PATCH 4/8] =?UTF-8?q?[=E5=81=9C=E8=BD=A6][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=88=B8=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/car/WxCarController.java | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java index 5932cd627..2b6eddba0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java @@ -200,24 +200,27 @@ public class WxCarController extends BaseController { logger.info(coupon.toString()); // Save to wx_counpon Date curDate = new Date(); - // check 同一个模板的券分配额是否超了 - if (StringUtils.isBlank(coupon.getVendorParams())) { - logger.error("请填充停车厂商优免券参数"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "停车厂商参数为空"); - } - JSONObject vendorParamsObj = JSON.parseObject(coupon.getVendorParams()); - Long templateId = vendorParamsObj.getLong("id"); - Integer amount = vendorParamsObj.getInteger("amount"); - Integer avaliavleNum = vendorParamsObj.getInteger("avaliavleNum"); - Integer amtCount = wxCouponCarService.getAmtCountByTemplateId(templateId); - Integer availCount = wxCouponCarService.getAvaibleCountByTemplateId(templateId); - if (amtCount >= amount) { - logger.error("总库存已达到停车厂商优免券数量限制"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "总库存已达到停车厂商优免券数量限制"); - } - if (availCount >= avaliavleNum) { - logger.error("可用库存已达到停车厂商优免券数量限制"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "可用库存已达到停车厂商优免券数量限制"); + WxPark park = getCurrentPark(); + if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { + // check 同一个模板的券分配额是否超了 + if (StringUtils.isBlank(coupon.getVendorParams())) { + logger.error("请填充停车厂商优免券参数"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "停车厂商参数为空"); + } + JSONObject vendorParamsObj = JSON.parseObject(coupon.getVendorParams()); + Long templateId = vendorParamsObj.getLong("id"); + Integer amount = vendorParamsObj.getInteger("amount"); + Integer avaliavleNum = vendorParamsObj.getInteger("avaliavleNum"); + Integer amtCount = wxCouponCarService.getAmtCountByTemplateId(templateId); + Integer availCount = wxCouponCarService.getAvaibleCountByTemplateId(templateId); + if (amtCount >= amount) { + logger.error("总库存已达到停车厂商优免券数量限制"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "总库存已达到停车厂商优免券数量限制"); + } + if (availCount >= avaliavleNum) { + logger.error("可用库存已达到停车厂商优免券数量限制"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "可用库存已达到停车厂商优免券数量限制"); + } } // check End coupon.setTenantId(getTenantId()); @@ -231,8 +234,6 @@ public class WxCarController extends BaseController { WxCouponCar couponCar = new WxCouponCar(); couponCar.setId(coupon.getId()); couponCar.setTenantId(getTenantId()); - - WxPark park = getCurrentPark(); couponCar.setParkId(park.getId()); couponCar.setVendorType(park.getVendorType()); couponCar.setVendorParams(coupon.getVendorParams()); From 86f3086e8fc3de110ed23b3981168529ba195b64 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 21 Sep 2019 16:58:59 +0800 Subject: [PATCH 5/8] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F=E5=8F=91=E5=8D=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=8F=91=E6=94=BE=E7=9A=84=E5=8D=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponPasswordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml index 933ce1e89..10bf8135b 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml @@ -141,7 +141,7 @@ (select count(*) as coupon_count,coupon_id from wx_coupon_password where tenant_id=#{tenantId} and status=0 group by coupon_id) cp inner join wx_coupon c on cp.coupon_id = c.id - where c.tenant_id=#{tenantId} and c.status=0 + where c.tenant_id=#{tenantId} and c.status=0 and put_apply_status in(0,2) and cp.`coupon_id` = #{couponId} From 23a3983ba5d66b964a0dda74dac64182cb3774a9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 21 Sep 2019 16:59:29 +0800 Subject: [PATCH 6/8] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F=E5=8F=91=E5=8D=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=8F=91=E6=94=BE=E7=9A=84=E5=8D=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponPasswordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml index 10bf8135b..83749cb13 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml @@ -141,7 +141,7 @@ (select count(*) as coupon_count,coupon_id from wx_coupon_password where tenant_id=#{tenantId} and status=0 group by coupon_id) cp inner join wx_coupon c on cp.coupon_id = c.id - where c.tenant_id=#{tenantId} and c.status=0 and put_apply_status in(0,2) + where c.tenant_id=#{tenantId} and c.status=0 and c.put_apply_status in(0,2) and cp.`coupon_id` = #{couponId} From 941cc11c9adbcf0c1094321e0c7adfc79440c9ec Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 21 Sep 2019 17:08:09 +0800 Subject: [PATCH 7/8] =?UTF-8?q?[=E5=81=9C=E8=BD=A6][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=88=B8=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java b/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java index 16627273b..2989ab1d7 100644 --- a/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java @@ -639,6 +639,7 @@ public class TJDUtil { paramMap.put("signType", "md5"); String jsonstr = JSON.toJSONString(paramMap); + logger.info(jsonstr); try { StringEntity se = new StringEntity(jsonstr, Consts.UTF_8); From a2598e33952e1594f430b84454f64d537dabe0d2 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 21 Sep 2019 17:42:23 +0800 Subject: [PATCH 8/8] =?UTF-8?q?[=E5=81=9C=E8=BD=A6][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=88=B8=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/utils/car/TJDUtil.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java b/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java index 2989ab1d7..62089fd95 100644 --- a/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java @@ -1,6 +1,7 @@ package com.iformall.utils.car; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponOrder; @@ -385,22 +386,24 @@ public class TJDUtil { paramMap.put(TJD_ACCOUNT_ID, accountId); paramMap.put(TJD_PREPAY_TYPE, TJD_PREPAY_TYPE_3); - Map detailMap = MapUtil.getOrderMap(); - detailMap.put(TJD_OUT_TRADE_NO, String.valueOf(couponOrder.getId())); - detailMap.put(TJD_TYPE, TJD_TYPE_COUPON); - detailMap.put(TJD_CHANNEL, "2204"); + JSONArray detailArr = new JSONArray(); + JSONObject detailObj = new JSONObject(); + detailObj.put(TJD_OUT_TRADE_NO, String.valueOf(couponOrder.getId())); + detailObj.put(TJD_TYPE, TJD_TYPE_COUPON); + detailObj.put(TJD_CHANNEL, "2204"); String memo = "会员优惠券"; if (coupon.getUnit().equals(0)) { - detailMap.put(TJD_COUPON_TYPE, "0"); - detailMap.put(TJD_AMOUNT, coupon.getPriceStr()); + detailObj.put(TJD_COUPON_TYPE, "0"); + detailObj.put(TJD_AMOUNT, coupon.getPriceStr()); memo += "-金额"; } else { - detailMap.put(TJD_COUPON_TYPE, "1"); - detailMap.put(TJD_MINUTES, String.valueOf(coupon.getPrice()*60)); + detailObj.put(TJD_COUPON_TYPE, "1"); + detailObj.put(TJD_MINUTES, String.valueOf(coupon.getPrice()*60)); memo += "-时长"; } - detailMap.put(TJD_MEMO, memo); - paramMap.put(TJD_DETAIL_LIST, JSON.toJSONString(detailMap)); + detailObj.put(TJD_MEMO, memo); + detailArr.add(detailObj); + paramMap.put(TJD_DETAIL_LIST, JSON.toJSONString(detailArr)); paramMap.put(TJD_CHARSET, TJD_UTF_8); paramMap.put(TJD_ACCOUNT, partner);