Przeglądaj źródła

Merge branch 'develop' of https://git.youlane.cn/server/formallProject into develop

release_toaliyun_real
Burce 6 lat temu
rodzic
commit
b3e902a90a
6 zmienionych plików z 24 dodań i 6 usunięć
  1. +3
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java
  4. +8
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
  6. +5
    -0
      mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml

+ 3
- 3
mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java Wyświetl plik

@@ -26,9 +26,9 @@ public class WxTagController extends BaseController {
private WxTagsService wxTagsService; private WxTagsService wxTagsService;


@ApiOperation("获取标签") @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 wxTags = new WxTags();
wxTags.setTypeId(EnumTagType.ID_27.getCode()); wxTags.setTypeId(EnumTagType.ID_27.getCode());
List<WxTags> listA = wxTagsService.findList(wxTags); List<WxTags> listA = wxTagsService.findList(wxTags);


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java Wyświetl plik

@@ -88,6 +88,10 @@ public class WxCouponChannel extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private Long merchantId; private Long merchantId;


@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "用户积分", name = "userCredit")
private Integer userCredit;

public String getWeappPath() { public String getWeappPath() {
if(type == null) if(type == null)
return "pages/index/index"; return "pages/index/index";


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java Wyświetl plik

@@ -11,4 +11,7 @@ public class WxMerchantSimpleVo {


@ApiModelProperty(value="商户名",name="merchantName") @ApiModelProperty(value="商户名",name="merchantName")
private String merchantName; private String merchantName;

@ApiModelProperty(value = "业态", name = "businessId")
private Integer businessId;
} }

+ 8
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Wyświetl plik

@@ -19,7 +19,6 @@ import com.iformall.enums.*;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.utils.BeanMapping;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;
import com.iformall.utils.EventUtil; import com.iformall.utils.EventUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -140,7 +139,14 @@ public class WxMerchantServiceImpl implements WxMerchantService {
wxMerchant.setTenantId(tenantId); wxMerchant.setTenantId(tenantId);
wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode());
List<WxMerchant> wxMerchantList = wxMerchantMapper.findList(wxMerchant); List<WxMerchant> wxMerchantList = wxMerchantMapper.findList(wxMerchant);
return BeanMapping.mapList(wxMerchantList,WxMerchantSimpleVo.class,(s, t)->t.setMerchantName(s.getName()));
List<WxMerchantSimpleVo> 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 @Override


+ 1
- 1
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Wyświetl plik

@@ -722,7 +722,7 @@


) bill ) bill
left join wx_merchant m on bill.merchant_id=m.id 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}
<if test=" null != merchantName and '' != merchantName">and m.name like concat('%', #{merchantName},'%')</if> <if test=" null != merchantName and '' != merchantName">and m.name like concat('%', #{merchantName},'%')</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if> <if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns"> order by totalOwe desc </if> <if test=" null == sortColumns"> order by totalOwe desc </if>


+ 5
- 0
mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml Wyświetl plik

@@ -91,6 +91,11 @@
and c.`support_transfer` = #{supportTransfer} and c.`support_transfer` = #{supportTransfer}
</if> </if>
<if test=" null != userCredit ">
and c.`credit_price` &lt;= #{userCredit}
</if>
<if test=" null != ids "> <if test=" null != ids ">
and cc.id in and cc.id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


Ładowanie…
Anuluj
Zapisz