suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
shuo.wang
2025-04-16 15:33:39 +08:00
parent 6a67c91b18
commit 368a61b8ff
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
View File

@@ -17,6 +17,7 @@ import com.cool.store.service.BuildInformationService;
import com.cool.store.mapper.BuildInformationMapper; import com.cool.store.mapper.BuildInformationMapper;
import com.cool.store.service.PreparationService; import com.cool.store.service.PreparationService;
import com.cool.store.service.UserAuthMappingService; import com.cool.store.service.UserAuthMappingService;
import com.cool.store.utils.poi.StringUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -102,13 +103,18 @@ public class BuildInformationServiceImpl implements BuildInformationService {
if (Objects.nonNull(warehouseInfoDO)) { if (Objects.nonNull(warehouseInfoDO)) {
response.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName()); response.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName());
} }
}else {
if (Objects.nonNull(pointInfo)){
response.setAddresseeProvince(pointInfo.getProvince());
response.setAddresseeCity(pointInfo.getCity());
response.setAddresseeDistrict(pointInfo.getDistrict());}
response.setAddresseeAddress(shopInfo.getDetailAddress());
} }
if (Objects.nonNull(pointInfo)) {
if (StringUtils.isNotBlank(response.getAddresseeProvince())){
response.setAddresseeProvince(pointInfo.getProvince());}
if (StringUtils.isNotBlank(response.getAddresseeCity())){
response.setAddresseeCity(pointInfo.getCity());}
if (StringUtils.isNotBlank(response.getAddresseeDistrict())){
response.setAddresseeDistrict(pointInfo.getDistrict());}
}
if (StringUtils.isNotBlank(response.getAddresseeAddress())){
response.setAddresseeAddress(shopInfo.getDetailAddress());}
return response; return response;
} }
@@ -152,20 +158,20 @@ public class BuildInformationServiceImpl implements BuildInformationService {
BuildInformationDO buildInformationDO = request.toDO(); BuildInformationDO buildInformationDO = request.toDO();
OrderSysInfoDO orderSysInfoDO = getOrderSysInfoDO(request); OrderSysInfoDO orderSysInfoDO = getOrderSysInfoDO(request);
OrderSysInfoDO orderSysInfoDO1 = orderSysInfoDAO.selectByShopId(request.getShopId()); OrderSysInfoDO orderSysInfoDO1 = orderSysInfoDAO.selectByShopId(request.getShopId());
if (Objects.nonNull(orderSysInfoDO1)){ if (Objects.nonNull(orderSysInfoDO1)) {
orderSysInfoDAO.updateByShopId(orderSysInfoDO); orderSysInfoDAO.updateByShopId(orderSysInfoDO);
}else{ } else {
orderSysInfoDAO.insertSelective(orderSysInfoDO); orderSysInfoDAO.insertSelective(orderSysInfoDO);
} }
ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId());
LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfoDO.getId()); QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfoDO.getId());
if (request.getJuridicalIsSamePartner()){ if (request.getJuridicalIsSamePartner()) {
request.setJuridicalIdCardNo(qualificationsInfoDO.getIdCardNo()); request.setJuridicalIdCardNo(qualificationsInfoDO.getIdCardNo());
request.setJuridicalIdCardFront(qualificationsInfoDO.getFrontOfIdCard()); request.setJuridicalIdCardFront(qualificationsInfoDO.getFrontOfIdCard());
request.setJuridicalIdCardReverse(qualificationsInfoDO.getBackOfIdCard()); request.setJuridicalIdCardReverse(qualificationsInfoDO.getBackOfIdCard());
} }
if (request.getSettlerIsSamePartner()){ if (request.getSettlerIsSamePartner()) {
request.setSettlerIdCardNo(qualificationsInfoDO.getIdCardNo()); request.setSettlerIdCardNo(qualificationsInfoDO.getIdCardNo());
request.setSettlerName(lineInfoDO.getUsername()); request.setSettlerName(lineInfoDO.getUsername());
request.setSettlerIdCardFront(qualificationsInfoDO.getFrontOfIdCard()); request.setSettlerIdCardFront(qualificationsInfoDO.getFrontOfIdCard());

3
coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
View File

@@ -59,7 +59,8 @@ public class SignValidateFilter implements Filter {
"/zxjp/mini/program/v1/partnerManage/openArea/areaApplyQuery", "/zxjp/mini/program/v1/partnerManage/openArea/areaApplyQuery",
"/zxjp/**/api/audit/result", "/zxjp/**/api/audit/result",
"/zxjp/**/api/license", "/zxjp/**/api/license",
"/zxjp/mini/line/getRegionPayPic" "/zxjp/mini/line/getRegionPayPic",
"/zxjp/mini/**"
); );