diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java
index e3185ad98..054ff6202 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java
@@ -10,12 +10,14 @@ import com.cool.store.request.xgj.XgjReimburseRequest;
import com.cool.store.utils.CoolDateUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.apache.commons.collections4.CollectionUtils;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.Date;
+import java.util.List;
/**
*
@@ -115,6 +117,9 @@ public class CloseStoreRefundAddRequest {
@NotBlank(message = "联行号不能为空")
private String bankBranchNo;
+ @ApiModelProperty("往来单位性质")
+ private List partnerProperty;
+
public XgjReimburseRequest convertToXgjRequest(CloseStoreMkUserDTO mkUserDTO, Integer closeReason, StoreDO storeDO) {
StoreCloseReasonEnum closeReasonEnum = StoreCloseReasonEnum.getByCode(closeReason);
return XgjReimburseRequest.builder()
@@ -135,7 +140,7 @@ public class CloseStoreRefundAddRequest {
.bankAcctName(businessName)
.bankAcctNumber(accountNumber)
.bankName(bankName)
- .accountType("PERSONAL")
+ .accountType("CORP")
.bankBranchNo(bankBranchNo)
.expenseList(Collections.singletonList(
XgjReimburseFeeRequest.builder()
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
index fe83b2b34..624d242fc 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
@@ -562,14 +562,6 @@ public class PointServiceImpl implements PointService {
if (AuditStatusEnum.REJECT.equals(auditStatus)) {
return auditRejectDeal(pointInfo, request.getReason());
}
- // 如果是三明治,将地址写入门店信息表
- ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(pointInfo.getShopId());
- if (Objects.nonNull(shopInfo) && Integer.valueOf(shopInfo.getFranchiseBrand()).equals(FranchiseBrandEnum.ZXSMZ.getCode())) {
- ShopInfoDO updateShopInfo = new ShopInfoDO();
- updateShopInfo.setId(pointInfo.getShopId());
- updateShopInfo.setDetailAddress(pointInfo.getAddress());
- shopInfoDAO.updateShopInfo(updateShopInfo);
- }
//处理下一节点任务及更新point状态
return dealNextAuditRecord(pointInfo, pointAuditRecordMap, pointTodo.getNodeNo());
}
@@ -1045,6 +1037,13 @@ public class PointServiceImpl implements PointService {
updateDetail.setLineSign(request.getLineSign());
updateDetail.setLineSignTime(new Date());
pointDetailInfoDAO.updatePointDetailInfo(updateDetail);
+ // 如果是三明治,将地址写入门店信息表
+ if (Integer.valueOf(shopInfo.getFranchiseBrand()).equals(FranchiseBrandEnum.ZXSMZ.getCode())) {
+ ShopInfoDO updateShopInfo = new ShopInfoDO();
+ updateShopInfo.setId(shopId);
+ updateShopInfo.setDetailAddress(pointInfo.getAddress());
+ shopInfoDAO.updateShopInfo(updateShopInfo);
+ }
List updateStatusList = new ArrayList<>();
//如果铺位是已审核 则进入上传租赁合同状态
if (PointStatusEnum.POINT_STATUS_5.getCode().equals(pointInfo.getPointStatus())) {