Quellcode durchsuchen

//mallcoo

release_toaliyun_real
xhxu vor 3 Jahren
Ursprung
Commit
2c6e385cd3
4 geänderte Dateien mit 12 neuen und 5 gelöschten Zeilen
  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 Datei anzeigen

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


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


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


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/MallCooUserInfoService.java Datei anzeigen

@@ -40,6 +40,6 @@ public interface MallCooUserInfoService {
* @param basicInfo * @param basicInfo
* @return * @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 Datei anzeigen

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


@Override @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(); TenantEntity mallCooPushTenant = new TenantEntity();


if(wxMallService.isgroupSupport(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(); TtMerchantPoi poiQ = new TtMerchantPoi();
poiQ.setParentTenantId(tenantEntity.getTenantId()); poiQ.setParentTenantId(tenantEntity.getTenantId());
poiQ.setPoiId(fromId); poiQ.setPoiId(fromId);
@@ -217,6 +223,7 @@ public class MallCooUserInfoServiceImpl implements MallCooUserInfoService {
mallCooPushTenant.updateTenantInfo(poiList.get(0)); mallCooPushTenant.updateTenantInfo(poiList.get(0));
} }
} }

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


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushMsgServiceImpl.java Datei anzeigen

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


WxOrderCouponVo wxOrderCouponVo = batchOrder.getOrders().get(0); 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())){ if(StringUtils.isBlank(mallCooPushTenant.getTenantId())){
throw new MallinkException(ErrorCode.MALL_INFO_NOT_FOUND.getCode(),"未找到推送商场"); throw new MallinkException(ErrorCode.MALL_INFO_NOT_FOUND.getCode(),"未找到推送商场");


Laden…
Abbrechen
Speichern