Просмотр исходного кода

//mallcoo

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
2c6e385cd3
4 измененных файлов: 12 добавлений и 5 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/mallcoo/biImport/VerifyGroup.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/MallCooUserInfoService.java
  3. +9
    -2
      mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushMsgServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/mallcoo/biImport/VerifyGroup.java Просмотреть файл

@@ -7,7 +7,7 @@ import lombok.Data;
public class VerifyGroup extends BasicBi{

@JsonIgnore
private Integer eventType= EnumBiEventType.buy.getCode();
private Integer eventType= EnumBiEventType.verify.getCode();

private String event_source;//事件来源:安卓、IOS、微信
private String order_id;//订单号


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/MallCooUserInfoService.java Просмотреть файл

@@ -40,6 +40,6 @@ public interface MallCooUserInfoService {
* @param basicInfo
* @return
*/
TenantEntity getMallCooPushTenant(TenantEntity tenantEntity,WxCUserBasicInfo basicInfo,String fromId);
TenantEntity getMallCooPushTenant(TenantEntity tenantEntity,WxCUserBasicInfo basicInfo,String verifyTenantId,String fromId);
}


+ 9
- 2
mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java Просмотреть файл

@@ -204,11 +204,17 @@ public class MallCooUserInfoServiceImpl implements MallCooUserInfoService {
}

@Override
public TenantEntity getMallCooPushTenant(TenantEntity tenantEntity,WxCUserBasicInfo basicInfo,String fromId) {
public TenantEntity getMallCooPushTenant(TenantEntity tenantEntity,WxCUserBasicInfo basicInfo,String verifyTenantId,String fromId) {
TenantEntity mallCooPushTenant = new TenantEntity();

if(wxMallService.isgroupSupport(tenantEntity)){
if(StringUtils.isNotBlank(fromId)){

if(StringUtils.isNotBlank(verifyTenantId) && !verifyTenantId.equals(tenantEntity.getTenantId())){
mallCooPushTenant.setTenantId(verifyTenantId);
mallCooPushTenant.setParentTenantId(tenantEntity.getTenantId());
}

if(StringUtils.isBlank(mallCooPushTenant.getTenantId()) && StringUtils.isNotBlank(fromId)){
TtMerchantPoi poiQ = new TtMerchantPoi();
poiQ.setParentTenantId(tenantEntity.getTenantId());
poiQ.setPoiId(fromId);
@@ -217,6 +223,7 @@ public class MallCooUserInfoServiceImpl implements MallCooUserInfoService {
mallCooPushTenant.updateTenantInfo(poiList.get(0));
}
}

if(StringUtils.isBlank(mallCooPushTenant.getTenantId())){
String[] split = basicInfo.getTenantId().split(",");
for (String tenantId: split) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushMsgServiceImpl.java Просмотреть файл

@@ -156,7 +156,7 @@ public class FmInsideOrderPushMsgServiceImpl implements MsgSendService {
}

WxOrderCouponVo wxOrderCouponVo = batchOrder.getOrders().get(0);
TenantEntity mallCooPushTenant = mallCooUserInfoService.getMallCooPushTenant(wxOrderCouponVo, basicInfo,wxOrderCouponVo.getFromId());
TenantEntity mallCooPushTenant = mallCooUserInfoService.getMallCooPushTenant(wxOrderCouponVo, basicInfo,wxOrderCouponVo.getBTenantId(),wxOrderCouponVo.getFromId());

if(StringUtils.isBlank(mallCooPushTenant.getTenantId())){
throw new MallinkException(ErrorCode.MALL_INFO_NOT_FOUND.getCode(),"未找到推送商场");


Загрузка…
Отмена
Сохранить