Browse Source

fix bug

release_toaliyun_real
winter 2 years ago
parent
commit
51e8e294a2
4 changed files with 6 additions and 7 deletions
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java

+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java View File

@@ -48,7 +48,6 @@ public class WxBusinessController extends BaseController {

@ApiOperation("业态全列表接口")
@GetMapping("listAll")
@SystemControllerLog(description = "业态-全列表")
public ResultData listAll() {
WxUserDataRule dataRule = this.getCurrentDataFloors();
String bussinessRule = null;


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java View File

@@ -42,8 +42,8 @@ public class WxUserDataRule extends TenantEntity {
}
public String getBussinessIds() {
if (StringUtils.isNotEmpty(businessForRule)) {
Object[] data = JSONArray.parseArray(businessForRule).toArray();
if (StringUtils.isNotEmpty(business)) {
Object[] data = JSONArray.parseArray(business).toArray();
return StringUtils.join(data, ",");
}
return null;


+ 2
- 2
mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java View File

@@ -12,8 +12,8 @@ public interface WxBusinessMapper extends CommonMapper<WxBusiness, String> {
List<WxBusiness> findList(WxBusiness wxBusiness);

List<WxBusiness> findListAll(WxBusiness wxBusiness);
List<WxBusiness> findListForMerchant(@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("isDel")Integer isDel,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId);
List<WxBusiness> findListForCoupon(@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("isDel")Integer isDel,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode);
List<WxBusiness> findListForMerchant(@Param("businessForRule")String businessForRule,@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("isDel")Integer isDel,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId);
List<WxBusiness> findListForCoupon(@Param("businessForRule")String businessForRule,@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("isDel")Integer isDel,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode);


List<Map<String,Object>> businessDataList(WxBusiness wxBusiness);


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java View File

@@ -90,9 +90,9 @@ public class WxBusinessServiceImpl implements WxBusinessService {
}else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) {
if (paltCode == null)
paltCode = EnumAppPlat.WX.getCode();
return wxBusinessMapper.findListForCoupon(tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),isDel,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode);
return wxBusinessMapper.findListForCoupon(bussinessRule,tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),isDel,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode);
}else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) {
return wxBusinessMapper.findListForMerchant(tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),isDel,tenantEntity.getTenantId(), tenantEntity.getParentTenantId());
return wxBusinessMapper.findListForMerchant(bussinessRule,tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),isDel,tenantEntity.getTenantId(), tenantEntity.getParentTenantId());
}else {
return wxBusinessMapper.findListAll(bq);
}


Loading…
Cancel
Save