diff --git a/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java b/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java index 175337e7..41622b11 100644 --- a/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java +++ b/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java @@ -121,6 +121,7 @@ public class PayPaymentController { @SysLog(module = SystemModule.Payment, title = "支付", biz = BizType.DELETE) @PreAuthorize("hasRole('pay:payment:cancel')") public R cancelById(@PathVariable("id") Long id){ + //TODO 远程同步东哥的数据,方案暂未落实 payPaymentService.cancel(id); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java b/src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java index a1a5447f..d713b04a 100644 --- a/src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java +++ b/src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java @@ -59,6 +59,9 @@ public class PayPayment implements Serializable { private String erpCode; + /** 发票编号 */ + private String billNumber; + /** 支付人id */ @NotBlank(message = "支付人id不能为空") @Length(max = 32,message = "支付人id长度不能超过32字") diff --git a/src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java b/src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java index eff35814..735bc977 100644 --- a/src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java +++ b/src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java @@ -24,6 +24,9 @@ import javax.validation.constraints.NotBlank; @Data public class PayPaymentBo implements Serializable { + /** 标题 */ + private String title; + /** 供应商id */ @NotNull(message = "供应商id不能为空") private Long supplierId; @@ -36,6 +39,10 @@ public class PayPaymentBo implements Serializable { /** ERP编码 */ private String erpCode; + /** 发票编号 */ + @NotNull(message = "发票编号不能为空") + private String billNumber; + /** 备注 */ @Length(max = 255,message = "备注长度不能超过255字") private String remark; @@ -44,7 +51,7 @@ public class PayPaymentBo implements Serializable { /** * 支付类型 * pay - 支付 - * unPay - 不再支付 + * unPay - 不再支付 TODO 同步告知东哥 **/ @NotNull(message = "支付类型不能为空") private String payType; diff --git a/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java b/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java index a44f2f33..3afb7a53 100644 --- a/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java @@ -13,11 +13,15 @@ import com.qs.serve.modules.pay.entity.bo.PayPaymentBo; import com.qs.serve.modules.pay.entity.dto.PayPaymentAmountDto; import com.qs.serve.modules.pay.service.PayHistoryItemService; import com.qs.serve.modules.pay.service.PayPaymentItemService; +import com.qs.serve.modules.seeyon.entity.XltPaymentRecord; +import com.qs.serve.modules.seeyon.service.XiaoLuTonService; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.entity.TbsActivity; import com.qs.serve.modules.tbs.service.TbsActivityService; +import com.qs.serve.modules.vtb.entity.VtbVerification; import com.qs.serve.modules.vtb.entity.VtbVerificationSubject; +import com.qs.serve.modules.vtb.service.VtbVerificationService; import com.qs.serve.modules.vtb.service.VtbVerificationSubjectService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -48,12 +52,15 @@ public class PayPaymentServiceImpl extends ServiceImpl saveApticlaim(XltApticlaim apticlaim); + + + /** + * 保存支付记录 + * @param paymentRecord + * @return + */ + R savePaymentRecord(XltPaymentRecord paymentRecord); + +} diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java index cd0bf3cc..e8858a17 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; @AllArgsConstructor public class SeeYonServiceImpl implements SeeYonService { - private SeeYonProperties seeYonProperties; + private SyBaseService syBaseService; private SysUserService sysUserService; @Nullable @@ -85,39 +85,39 @@ public class SeeYonServiceImpl implements SeeYonService { @Override public R baseCreateProcess(BaseCreateProcessBo createProcessBo) { String title = "创建流程"; - return postBase(TbsSeeYonConst.API_PROCESS_CREATE,createProcessBo,title); + return syBaseService.postBase(TbsSeeYonConst.API_PROCESS_CREATE,createProcessBo,title); } @Override public R getCostFormId(Long costApplyId) { String title = "获取表单ID"; String url2 = TbsSeeYonConst.API_GET_COST_FORM_ID+"?costApplyId="+costApplyId; - return getBase(url2,title); + return syBaseService.getBase(url2,title); } @Override public R getCheckFormId(Long checkId) { String title = "获取表单ID"; String url2 = TbsSeeYonConst.API_GET_CHECK_FORM_ID+"?checkId="+checkId; - return getBase(url2,title); + return syBaseService.getBase(url2,title); } @Override public R affairCommit(CtpAffairCommit affairCommit) { String title = "审批流程"; - return postBase(TbsSeeYonConst.API_PROCESS_COMMIT,affairCommit,title); + return syBaseService.postBase(TbsSeeYonConst.API_PROCESS_COMMIT,affairCommit,title); } @Override public R affairCancel(CtpAffairCancel affairCancel) { String title = "取消流程"; - return postBase(TbsSeeYonConst.API_PROCESS_CANCEL,affairCancel,title); + return syBaseService.postBase(TbsSeeYonConst.API_PROCESS_CANCEL,affairCancel,title); } @Override public R> pageMemberAffair(CtpAffairQo ctpAffairQo) { String title = "用户审批流程"; - R result = postBase(TbsSeeYonConst.API_PAGE_AFFAIR,ctpAffairQo,title); + R result = syBaseService.postBase(TbsSeeYonConst.API_PAGE_AFFAIR,ctpAffairQo,title); if(result.getStatus()==200){ PageVo pageVo = JsonUtil.jsonToPojo(result.getData(),PageVo.class); List affairList = new ArrayList<>(); @@ -137,7 +137,7 @@ public class SeeYonServiceImpl implements SeeYonService { @Override public R> listFormAffair(CtpAffairQo ctpAffairQo) { String title = "表单审批节点"; - R result = postBase(TbsSeeYonConst.API_LIST_AFFAIR,ctpAffairQo,title); + R result = syBaseService.postBase(TbsSeeYonConst.API_LIST_AFFAIR,ctpAffairQo,title); if(result.getStatus()==200){ List list = JsonUtil.jsonToPojo(result.getData(),List.class); List affairList = new ArrayList<>(); @@ -153,30 +153,6 @@ public class SeeYonServiceImpl implements SeeYonService { return null; } - private R getBase(String url2, String title){ - String url = getBaseUrl(); - R result = HttpUtil.doGetResult(url+url2,null); - if(result.getStatus()!=200){ - log.error("致远服务失败[{},{}] url2:{}",title,result.getMsg(),url2); - } - return result; - } - private R postBase(String url2,Object param,String title){ - String url = getBaseUrl(); - R result = HttpUtil.doPostResult(url + url2, JsonUtil.objectToJson(param),null); - if(result.getStatus()!=200){ - log.error("致远服务失败[{},{}]\nParam:{}",title,result.getMsg(),JsonUtil.objectToJson(param)); - } - log.debug("致远服务返回R:{}",JsonUtil.objectToJson(result)); - return result; - } - - private String getBaseUrl(){ - if(!seeYonProperties.getEnable()){ - Assert.throwEx("远程服务未开启"); - } - return seeYonProperties.getUrl(); - } } diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SyBaseService.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SyBaseService.java new file mode 100644 index 00000000..d45fbe4a --- /dev/null +++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SyBaseService.java @@ -0,0 +1,52 @@ +package com.qs.serve.modules.seeyon.service.impl; + +import com.qs.serve.common.config.properties.SeeYonProperties; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.util.Assert; +import com.qs.serve.common.util.HttpUtil; +import com.qs.serve.common.util.JsonUtil; +import com.qs.serve.modules.sys.service.SysUserService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @author YenHex + * @since 2023/1/4 + */ +@Slf4j +@Service +@AllArgsConstructor +public class SyBaseService { + + + private SeeYonProperties seeYonProperties; + private SysUserService sysUserService; + + public R getBase(String url2, String title){ + String url = getBaseUrl(); + R result = HttpUtil.doGetResult(url+url2,null); + if(result.getStatus()!=200){ + log.error("致远服务失败[{},{}] url2:{}",title,result.getMsg(),url2); + } + return result; + } + + public R postBase(String url2,Object param,String title){ + String url = getBaseUrl(); + R result = HttpUtil.doPostResult(url + url2, JsonUtil.objectToJson(param),null); + if(result.getStatus()!=200){ + log.error("致远服务失败[{},{}]\nParam:{}",title,result.getMsg(),JsonUtil.objectToJson(param)); + } + log.debug("致远服务返回R:{}",JsonUtil.objectToJson(result)); + return result; + } + + public String getBaseUrl(){ + if(!seeYonProperties.getEnable()){ + Assert.throwEx("远程服务未开启"); + } + return seeYonProperties.getUrl(); + } + +} diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/XiaoLuTonServiceImpl.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/XiaoLuTonServiceImpl.java new file mode 100644 index 00000000..79966b41 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/XiaoLuTonServiceImpl.java @@ -0,0 +1,35 @@ +package com.qs.serve.modules.seeyon.service.impl; + +import com.qs.serve.common.model.dto.R; +import com.qs.serve.modules.seeyon.entity.XltApticlaim; +import com.qs.serve.modules.seeyon.entity.XltPaymentRecord; +import com.qs.serve.modules.seeyon.service.XiaoLuTonService; +import com.qs.serve.modules.tbs.common.TbsSeeYonConst; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @author YenHex + * @since 2023/1/3 + */ +@Slf4j +@Service +@AllArgsConstructor +public class XiaoLuTonServiceImpl implements XiaoLuTonService { + + private SyBaseService syBaseService; + + @Override + public R saveApticlaim(XltApticlaim apticlaim) { + String title = "保存核销记录"; + return syBaseService.postBase(TbsSeeYonConst.XLT_SAVE_CHECK,apticlaim,title); + } + + @Override + public R savePaymentRecord(XltPaymentRecord paymentRecord) { + String title = "保存支付记录"; + return syBaseService.postBase(TbsSeeYonConst.XLT_SAVE_PAYMENT,paymentRecord,title); + } + +} diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java index add75ed8..56fc3275 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java +++ b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java @@ -20,4 +20,7 @@ public interface TbsSeeYonConst { String API_PAGE_AFFAIR = "/process/pageMemberAffair"; String API_LIST_AFFAIR = "/process/listFormAffair"; + String XLT_SAVE_CHECK = "/xlt/saveCheck"; + String XLT_SAVE_PAYMENT = "/xlt/savePayment"; + }