diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java index b8e7bdca3..1e32ee6ed 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java @@ -26,9 +26,9 @@ public class WxTagController extends BaseController { private WxTagsService wxTagsService; @ApiOperation("获取标签") - @GetMapping("getData") - public ResultData getTags() { - log.debug("[" + getIpAddr() + "] WxCreditHistoryController::getTagsByBussiness"); + @GetMapping("/getData") + public ResultData getData() { + log.debug("[" + getIpAddr() + "] WxTagController::getData"); WxTags wxTags = new WxTags(); wxTags.setTypeId(EnumTagType.ID_27.getCode()); List listA = wxTagsService.findList(wxTags); 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 fb5cb91c5..9cd9818c6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -88,6 +88,10 @@ public class WxCouponChannel extends BaseEntity { @TableField(exist = false) private Long merchantId; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value = "用户积分", name = "userCredit") + private Integer userCredit; + public String getWeappPath() { if(type == null) return "pages/index/index"; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java index 6177bb153..9f39aaa2c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java @@ -11,4 +11,7 @@ public class WxMerchantSimpleVo { @ApiModelProperty(value="商户名",name="merchantName") private String merchantName; + + @ApiModelProperty(value = "业态", name = "businessId") + private Integer businessId; } 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 90b9bdcff..8e110318f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -19,7 +19,6 @@ import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.*; -import com.iformall.utils.BeanMapping; import com.iformall.utils.DateUtils; import com.iformall.utils.EventUtil; import org.apache.commons.lang3.StringUtils; @@ -140,7 +139,14 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.setTenantId(tenantId); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); List wxMerchantList = wxMerchantMapper.findList(wxMerchant); - return BeanMapping.mapList(wxMerchantList,WxMerchantSimpleVo.class,(s, t)->t.setMerchantName(s.getName())); + List collect = wxMerchantList.stream().map(x -> { + WxMerchantSimpleVo wxMerchantSimpleVo = new WxMerchantSimpleVo(); + wxMerchantSimpleVo.setId(x.getId()); + wxMerchantSimpleVo.setMerchantName(x.getName()); + wxMerchantSimpleVo.setBusinessId(x.getBusinessId()); + return wxMerchantSimpleVo; + }).collect(Collectors.toList()); + return collect; } @Override diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 8081da111..e730f1ab6 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -722,7 +722,7 @@ ) bill left join wx_merchant m on bill.merchant_id=m.id - where m.status=1 and m.tenant_id = #{tenantId} + where m.tenant_id = #{tenantId} and m.name like concat('%', #{merchantName},'%') order by ${sortColumns} order by totalOwe desc diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 282ec1180..63e426d54 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -91,6 +91,11 @@ and c.`support_transfer` = #{supportTransfer} + + and c.`credit_price` <= #{userCredit} + + + and cc.id in