Browse Source

fix bug

release_toaliyun_real
lin 3 years ago
parent
commit
14e9a48a5b
6 changed files with 45 additions and 1 deletions
  1. +18
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
  2. +15
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCouponMallMapper.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java
  5. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java
  6. +5
    -0
      mallinkService/src/main/resources/mapper/WxCouponMallMapper.xml

+ 18
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java View File

@@ -118,6 +118,24 @@ public class WxProjectConfigController extends BaseController {
//
// }

@ApiOperation("查询商场集团列表")
@GetMapping(value = "/childMallList")
@SystemControllerLog(description = "商场基础数据")
@TenantIgnore
public ResultData childMallList(@ModelAttribute WxMall wxMall, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::getMallList");
try {
if(wxMall == null){
wxMall = new WxMall();
}
wxMall.setParentTenantId(this.getTenantInfo().getTenantId());
PageInfo<WxMall> page = wxMallService.listAsPage(wxMall, pageNum, pageSize);
return new ResultData(page);
}catch (Exception e){
logger.error(e.getMessage(),e);
return new ResultData(ErrorCode.SYS_SERVER_ERROR);
}
}

@ApiOperation("查询商场集团列表")
@GetMapping(value = "/mallList")


+ 15
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java View File

@@ -84,8 +84,22 @@ public class WxCouponController extends BaseController {
public ResultData parentCouponList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Boolean isList) {
logger.debug("[" + getIpAddr() + "] WxCouponController::list");
if (wxCoupon == null) wxCoupon = new WxCoupon();
wxCoupon.setTenantId(getTenantInfo().getParentTenantId());
TenantEntity mallTenantEntity = getTenantInfo();
wxCoupon.setTenantId(mallTenantEntity.getParentTenantId());
wxCoupon.setParentTenantId(null);
//平台券
if (EnumCouponType.COUPON_DOUYIN_PLAT.getCode() == wxCoupon.getType()) {
//查询已经分配了的parentCouponList
WxCouponMall couponMall = new WxCouponMall();
couponMall.updateTenantInfo(wxCoupon);
couponMall.setMallTenantId(mallTenantEntity.getTenantId());
List<Long> couponIds = wxCouponMallService.listCouponIds(couponMall);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
}
}
return couponList(wxCoupon, pageNum, pageSize, isList);
}


+ 1
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCouponMallMapper.java View File

@@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Param;
public interface WxCouponMallMapper extends CommonMapper<WxCouponMall, Long> {

List<WxCouponMall> findList(WxCouponMall wxCouponMall);
List<Long> findCouponIdList(WxCouponMall wxCouponMall);
void updateStatus(WxCouponMall wxCouponMall);
void delteAllByProductId(WxCouponMall wxCouponMall);
}

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java View File

@@ -23,6 +23,7 @@ public interface WxCouponMallService {
PageInfo<WxCouponMall> listAsPage(WxCouponMall record, Integer pageIndex, Integer pageSize);
List<WxCouponMall> list(WxCouponMall wxCouponMall,boolean queryMall);
List<Long> listCouponIds(WxCouponMall wxCouponMall);
void finised(String tenantId,Long couponId,String mallTenantId);
void unfinised(String tenantId, Long couponId,Integer couponType, String mallTenantId) throws Exception;


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java View File

@@ -61,6 +61,11 @@ public class WxCouponMallServiceImpl implements WxCouponMallService {
return list;
}
@Override
public List<Long> listCouponIds(WxCouponMall wxCouponMall){
return wxCouponMallMapper.findCouponIdList(wxCouponMall);
}
@Override
public PageInfo<WxCouponMall> listAsPage(WxCouponMall record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponMallMapper.findList(record));


+ 5
- 0
mallinkService/src/main/resources/mapper/WxCouponMallMapper.xml View File

@@ -77,6 +77,11 @@
<include refid="dynamicWhereConditions" />
</select>
<select id="findCouponIdList" parameterType="com.iformall.domain.po.WxCouponMall" resultType="Long">
select product_id from wx_coupon_mall
<include refid="dynamicWhereConditions" />
</select>
<update id = "updateStatus" parameterType="com.iformall.domain.po.WxCouponMall">
update wx_coupon_mall set status = #{status} where `product_id` = #{productId}
and `tenant_id` = #{tenantId} and `mall_tenant_id` = #{mallTenantId}


Loading…
Cancel
Save