소스 검색

fix a端券详情

release_toaliyun_real
winter 4 년 전
부모
커밋
29f1c8268e
3개의 변경된 파일21개의 추가작업 그리고 15개의 파일을 삭제
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  2. +18
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  3. +1
    -3
      mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java 파일 보기

@@ -162,8 +162,8 @@ public class WxCouponOrderBVo extends WxCouponOrder {
private String shopNumber;

/**发券商户信息*/
// @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList")
// private List<WxMerchantVo> merchantVoList;
@io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList")
private List<WxMerchantVo> merchantVoList;

/**发券渠道信息*/
@io.swagger.annotations.ApiModelProperty(value="商户列表",name="channelType")


+ 18
- 10
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java 파일 보기

@@ -335,7 +335,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
PageInfo<WxCouponOrder> couponOrderPage = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() ->wxCouponOrderMapper.findListOfVerifiedByDateForBUser(dateMap));
PageInfo<WxCouponOrderBVo> pageInfo = new PageInfo<WxCouponOrderBVo>();
pageInfo.setList(handleToCouponOrderBVoList(tenantEntity,couponOrderPage.getList()));
pageInfo.setList(handleToCouponOrderBVoList(tenantEntity,couponOrderPage.getList(),false,false));
pageInfo.setPageNum(couponOrderPage.getPageNum());
pageInfo.setPageSize(couponOrderPage.getPageSize());
pageInfo.setPages(couponOrderPage.getPages());
@@ -368,7 +368,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
PageInfo<WxCouponOrder> couponOrderPage = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() ->wxCouponOrderMapper.findListOfOrderedByDateForBUser(dateMap));
PageInfo<WxCouponOrderBVo> pageInfo = new PageInfo<WxCouponOrderBVo>();
pageInfo.setList(handleToCouponOrderBVoList(tenantEntity,couponOrderPage.getList()));
pageInfo.setList(handleToCouponOrderBVoList(tenantEntity,couponOrderPage.getList(),false,false));
pageInfo.setPageNum(couponOrderPage.getPageNum());
pageInfo.setPageSize(couponOrderPage.getPageSize());
pageInfo.setPages(couponOrderPage.getPages());
@@ -376,7 +376,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
return pageInfo;
}
private List<WxCouponOrderBVo> handleToCouponOrderBVoList(TenantEntity tenantEntity,List<WxCouponOrder> couponOrderList) {
private List<WxCouponOrderBVo> handleToCouponOrderBVoList(TenantEntity tenantEntity,List<WxCouponOrder> couponOrderList,boolean hasMerchant,boolean hasShop) {
List<WxCouponOrderBVo> retList = null;
if (null != couponOrderList && couponOrderList.size() > 0 ) {
retList = new ArrayList<WxCouponOrderBVo>();
@@ -466,10 +466,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
}
}
Map<Long, List<WxMerchantVo>> couponMerchantVoMap = null;
if (hasMerchant) {
couponMerchantVoMap = wxMerchantService.findCouponMerchantVoList(couponIdList, tenantEntity,hasShop);
}
for (int i = 0 ; i < couponOrderList.size() ; i ++) {
WxCouponOrder couponOrder = couponOrderList.get(i);
WxCouponOrderBVo bvo = couponOrdertoBVo(couponOrder,bUserMap,merchantSimpleMap,cUserSimpleMap,couponMap);
WxCouponOrderBVo bvo = couponOrdertoBVo(couponOrder,bUserMap,merchantSimpleMap,cUserSimpleMap,couponMap,hasMerchant,couponMerchantVoMap);
if (null != bvo ) {
retList.add(bvo);
}
@@ -478,7 +482,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
return retList;
}
private WxCouponOrderBVo couponOrdertoBVo(WxCouponOrder couponOrder,Map<Long,WxMerchantBUser> bUserMap,Map<Long,WxMerchant> merchantSimpleMap,Map<Long,WxCUserBasicInfo> cUserSimpleMap,Map<Long,WxCoupon> couponMap) {
private WxCouponOrderBVo couponOrdertoBVo(WxCouponOrder couponOrder,Map<Long,WxMerchantBUser> bUserMap,Map<Long,WxMerchant> merchantSimpleMap,Map<Long,WxCUserBasicInfo> cUserSimpleMap,
Map<Long,WxCoupon> couponMap,boolean hasMerchant,Map<Long, List<WxMerchantVo>> couponMerchantVoMap) {
WxCouponOrderBVo bvo = new WxCouponOrderBVo();
try {
BeanUtils.copyProperties(bvo, couponOrder);
@@ -511,11 +516,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
bvo.setAutoRefund(coupon.getAutoRefund());
bvo.setBusiness(coupon.getBusiness());
bvo.setSubsidyType(coupon.getSubsidyType());
//c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,,
}
if (hasMerchant) {
bvo.setMerchantVoList(couponMerchantVoMap.get(bvo.getCouponId()));
}
}
bvo.setSubsidyNum(bvo.getSubsidy());
return bvo;
} catch (IllegalAccessException e) {
@@ -761,7 +766,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
}
Map<Long, List<WxMerchantVo>> couponMerchantVoMap = wxMerchantService.findCouponMerchantVoList(couponIds, tenantEntity,false);
Map<Long, List<WxMerchantVo>> couponMerchantVoMap = null;
if (getMerchant) {
couponMerchantVoMap = wxMerchantService.findCouponMerchantVoList(couponIds, tenantEntity,false);
}
List<WxCouponOrderCarCVo> volist = new ArrayList<WxCouponOrderCarCVo>();
for (int i = 0 ; i < couponOrderList.size(); i++){
@@ -1152,7 +1160,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
List<WxCouponOrder> couponOrderList = new ArrayList<WxCouponOrder>();
couponOrderList.add(couponOrder);
List<WxCouponOrderBVo> wxCouponOrderBVoList = handleToCouponOrderBVoList(tenantinfo,couponOrderList);
List<WxCouponOrderBVo> wxCouponOrderBVoList = handleToCouponOrderBVoList(tenantinfo,couponOrderList,true,true);
if (wxCouponOrderBVoList == null || wxCouponOrderBVoList.size() <= 0 )
return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL);
return new ResultData(wxCouponOrderBVoList.get(0));


+ 1
- 3
mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java 파일 보기

@@ -363,9 +363,7 @@ public class EtcpHelper {
}

// 优先从从商户表里取
if (null != merchantVo) {
businessId = getETCPBusinessID(merchantVo.getId());
}
businessId = getETCPBusinessID(merchantVo.getId());
if (StringUtils.isBlank(businessId)) {
// 1期只有一个虚拟商户,可以写在商场配置里
businessId = objParams.getString("businessId");


불러오는 중...
취소
저장