Parcourir la source

//poi

release_toaliyun_real
xhxu il y a 3 ans
Parent
révision
4cc08344c8
2 fichiers modifiés avec 17 ajouts et 1 suppressions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java
  2. +16
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/TtMerchantPoi.java Voir le fichier

@@ -19,7 +19,7 @@ public class TtMerchantPoi extends TenantEntity {


protected Long id;//merchant_id protected Long id;//merchant_id


@io.swagger.annotations.ApiModelProperty(value=" merchant_id",name="supplierExtId")
@io.swagger.annotations.ApiModelProperty(value=" 暂定merchant_id",name="supplierExtId")
private String supplierExtId; private String supplierExtId;


@io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName")


+ 16
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Voir le fichier

@@ -136,6 +136,8 @@ public class WxCouponServiceImpl implements WxCouponService {
@Autowired @Autowired
private TtGoodsCategoryService ttGoodsCategoryService; private TtGoodsCategoryService ttGoodsCategoryService;


@Autowired
private TtMerchantPoiService ttMerchantPoiService;


@Autowired @Autowired
WxAppinfoService wxAppinfoService; WxAppinfoService wxAppinfoService;
@@ -578,6 +580,20 @@ public class WxCouponServiceImpl implements WxCouponService {
return new ResultData(ErrorCode.APP_ID_NOT_FOUND); return new ResultData(ErrorCode.APP_ID_NOT_FOUND);
} }


//判断商户是否匹配poi
if (EnumAppPlat.TOUTIAO.equals(plat)) {
List<String> badPoiNames = new ArrayList();
for (WxMerchant merchant:merchantList) {
TtMerchantPoi byId = ttMerchantPoiService.getById(merchant.getId());
if(byId == null || !EnumSupplierMathStatus.match_success.getCode().equals(byId.getMatchStatus())){
badPoiNames.add(merchant.getName());
}
}
if(!badPoiNames.isEmpty()){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), JSONArray.toJSONString(badPoiNames)+"未匹配poi");
}
}

EnumPayMchType payMchType = EnumPayMchType.getEnum(payAccount.getMchType()); EnumPayMchType payMchType = EnumPayMchType.getEnum(payAccount.getMchType());
EnumPayShare isShare = EnumPayShare.getEnum(payAccount.getShare()); EnumPayShare isShare = EnumPayShare.getEnum(payAccount.getShare());




Chargement…
Annuler
Enregistrer