Merge #83 into master from cc_20260330_fix
fix:新管家退款单字段补充修改;三明治门店详细地址获取逻辑修改
* cc_20260330_fix: (12 commits squashed)
- fix:日志
- fix:问题修复
- fix:闭店二级审批改为运营片区总顾问
- fix:在营和暂停营业允许发起闭店
- fix:新管家支行接口路径修改
- Merge branch 'master' into cc_20260330_fix
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdXgjServiceImpl.java
- fix:新管家退款单字段补充修改
- fix:新管家退款单字段补充修改
- Merge branch 'master' into cc_20260330_fix
# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java
- fix:三明治铺位详细地址更新到门店地址字段
- fix:三明治铺位详细地址更新到门店地址字段
- fix:退款账户类型全部改为CORP
Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/83
This commit is contained in:
@@ -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;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -115,6 +117,9 @@ public class CloseStoreRefundAddRequest {
|
||||
@NotBlank(message = "联行号不能为空")
|
||||
private String bankBranchNo;
|
||||
|
||||
@ApiModelProperty("往来单位性质")
|
||||
private List<String> 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()
|
||||
|
||||
Reference in New Issue
Block a user