Explorar el Código

/、.merchant

release_toaliyun_real
xhxu hace 4 años
padre
commit
4b2e26d046
Se han modificado 3 ficheros con 11 adiciones y 2 borrados
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  3. +7
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java Ver fichero

@@ -188,5 +188,7 @@ public interface WxMerchantService {


Map<String, Object> detailByShopId(TenantEntity tenantInfo, Long shopId); Map<String, Object> detailByShopId(TenantEntity tenantInfo, Long shopId);


List<WxMerchantVo> newFindWithShopByCouponId(TenantEntity tenantInfo, Long couponId);

List<WxMerchantVo> newFindByCouponId(TenantEntity tenantInfo, Long couponId); List<WxMerchantVo> newFindByCouponId(TenantEntity tenantInfo, Long couponId);
} }

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Ver fichero

@@ -647,8 +647,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
cvo.setPickStartDate(coupon.getPickStartDate()); cvo.setPickStartDate(coupon.getPickStartDate());
cvo.setPickEndDate(coupon.getPickEndDate()); cvo.setPickEndDate(coupon.getPickEndDate());
cvo.setAutoRefund(coupon.getAutoRefund()); cvo.setAutoRefund(coupon.getAutoRefund());
cvo.setMerchantVoList(wxMerchantService.newFindWithShopByCouponId(cvo,coupon.getId()));
} }
cvo.setMerchantVoList(wxMerchantService.newFindByCouponId(cvo,cvo.getCouponId()));
return cvo; return cvo;
} catch (IllegalAccessException | InvocationTargetException e) { } catch (IllegalAccessException | InvocationTargetException e) {
logger.error("getCouponOrderCVo error.",e); logger.error("getCouponOrderCVo error.",e);
@@ -785,6 +785,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
cvo.setValidStartDate(coupon.getValidStartDate()); cvo.setValidStartDate(coupon.getValidStartDate());
cvo.setValidEndDate(coupon.getValidEndDate()); cvo.setValidEndDate(coupon.getValidEndDate());
cvo.setAutoRefund(coupon.getAutoRefund()); cvo.setAutoRefund(coupon.getAutoRefund());
cvo.setMerchantVoList(wxMerchantService.newFindByCouponId(cvo,coupon.getId()));
} }
WxCouponCar couponCar= couponCarMap.get(cvo.getCouponId()); WxCouponCar couponCar= couponCarMap.get(cvo.getCouponId());
if (null != couponCar) { if (null != couponCar) {


+ 7
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Ver fichero

@@ -1196,11 +1196,17 @@ public class WxMerchantServiceImpl implements WxMerchantService {
return null; return null;
} }


@Override
public List<WxMerchantVo> newFindWithShopByCouponId(TenantEntity tenantInfo, Long couponId) {
List<WxMerchantVo> wxMerchantVoList = this.newFindByCouponId(tenantInfo, couponId);
handleShopVo(tenantInfo,wxMerchantVoList);
return wxMerchantVoList;
}

@Override @Override
public List<WxMerchantVo> newFindByCouponId(TenantEntity tenantInfo, Long couponId) { public List<WxMerchantVo> newFindByCouponId(TenantEntity tenantInfo, Long couponId) {
List<Long> merchantIds = wxCouponMerchantMapper.findMerchantByProductId(tenantInfo.getTenantId(), couponId); List<Long> merchantIds = wxCouponMerchantMapper.findMerchantByProductId(tenantInfo.getTenantId(), couponId);
List<WxMerchantVo> wxMerchantVoList = wxMerchantMapper.newFindListCVo(tenantInfo.getTenantId(),merchantIds); List<WxMerchantVo> wxMerchantVoList = wxMerchantMapper.newFindListCVo(tenantInfo.getTenantId(),merchantIds);
handleShopVo(tenantInfo,wxMerchantVoList);
return wxMerchantVoList; return wxMerchantVoList;
} }




Cargando…
Cancelar
Guardar