|
|
@@ -25,6 +25,7 @@ import com.payment.platform.module.payment.har.dto.HarOrderQueryDTO;
|
|
|
import com.payment.platform.module.payment.har.dto.HarOrderVO;
|
|
|
import com.payment.platform.module.payment.har.entity.HarMerchantEntity;
|
|
|
import com.payment.platform.module.payment.har.entity.HarOrderEntity;
|
|
|
+import com.payment.platform.module.payment.har.entity.HarShopEntity;
|
|
|
import com.payment.platform.module.payment.har.enums.HarOrderStatus;
|
|
|
import com.payment.platform.module.payment.har.mapper.HarOrderMapper;
|
|
|
import com.payment.platform.module.payment.stream.OrderEventPublisher;
|
|
|
@@ -461,9 +462,11 @@ public class HarOrderService {
|
|
|
String thirdShopCode = dto.getThirdShopCode();
|
|
|
if (StrUtil.isBlank(dto.getShopCode()) && StrUtil.isBlank(thirdShopCode)
|
|
|
&& (StrUtil.isNotBlank(dto.getIp()) || StrUtil.isNotBlank(dto.getProvinceCode()))) {
|
|
|
- thirdShopCode = shopService.pickForOrder(
|
|
|
+ HarShopEntity harShopEntity = shopService.pickForOrder(
|
|
|
merchant.getMerchantCode(), dto.getProvinceCode(), dto.getIp(),
|
|
|
- dto.getOutBizNo()).getThirdShopId();
|
|
|
+ dto.getOutBizNo());
|
|
|
+ thirdShopCode = harShopEntity.getThirdShopId();
|
|
|
+ dto.setShopCode(harShopEntity.getShopId());
|
|
|
}
|
|
|
|
|
|
String orderNo = ORDER_NO_PREFIX + SnowflakeIdGenerator.nextIdStr();
|