hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project

This commit is contained in:
lvleigang 2024-07-05 09:19:16 +08:00
parent abe1500dde 68083196ee
commit 7080685aad
8 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java
View File

@ -371,7 +371,7 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
} else {
result.setPayResult(PayState.payStateGetValue(pay_status));//支付状态 支付状态和支付申请状态用一个
}
agentPaymentService.updateResult(result);
//更新明细表
List<AgentPayQueryDTO> agentDetails = agentPayResultResDTO.getAgentDetails();
for (AgentPayQueryDTO d : agentDetails) {
@ -386,6 +386,8 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
detail.setDataSourceCode(oa_data_source_code);
agentPaymentDetailService.updatePayResult(detail);
}
result.setPayDate(CBSUtil.convertTimestampToString(agentDetails.get(0).getDtlPayTime()));
agentPaymentService.updateResult(result);
}
}
return agentPayResultResDTO;

2
buildpackage/src/main/resources/application-yc.yml
View File

@ -87,4 +87,4 @@ cbs8:
#电子回单下载临时存放位置
elec_path: /zt/elecfile
OA:
data_source_code: yc_oa
data_source_code: OA

4
buildpackage/src/main/resources/application-yuecheng.yml
View File

@ -28,4 +28,6 @@ cbs8:
# 这个私钥到时候上传到cbs，和下面到是同一对
#ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185
cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185
OA:
data_source_code: OA

11
service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java
View File

@ -35,7 +35,8 @@ public class AgentPaymentEntity extends BaseEntity {
private String applyCode;
//支付结果
private String payResult;
//支付日期
private String payDate;
private String tableName;//表名称
private String billName;//单据名称
@ -142,4 +143,12 @@ public class AgentPaymentEntity extends BaseEntity {
public void setPayResult(String payResult) {
this.payResult = payResult;
}
public String getPayDate() {
return payDate;
}
public void setPayDate(String payDate) {
this.payDate = payDate;
}
}

1
service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml
View File

@ -120,6 +120,7 @@
update formmain_0224 set
<trim suffix="" suffixOverrides=",">
<if test="applyCode != null and applyCode !='' ">field0043 =#{applyCode},</if>
<if test="payDate != null and payDate !='' ">field0058 =#{payDate},</if>
<if test="payResult != null and payResult !='' ">field0046 =#{payResult}</if>
</trim>
where id = #{oaId}

18
service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.java
View File

@ -27,6 +27,24 @@ public class PayBillEntity extends BaseEntity {
private String pkBalatype;//结算方式
private String billCode;//单据编号
private String queryState;
private String pkRecproject;//收款方名称
private String memo;//摘要
public String getPkRecproject() {
return pkRecproject;
}
public void setPkRecproject(String pkRecproject) {
this.pkRecproject = pkRecproject;
}
public String getMemo() {
return memo;
}
public void setMemo(String memo) {
this.memo = memo;
}
public String getQueryState() {
return queryState;

12
service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
View File

@ -12,12 +12,14 @@
<result property="fieldName" column="field_name" jdbcType="VARCHAR"/>
<result property="pkBalatype" column="pk_balatype" jdbcType="VARCHAR"/>
<result property="billCode" column="bill_code" jdbcType="VARCHAR"/>
<result property="memo" column="memo" jdbcType="VARCHAR"/>
<result property="pkRecproject" column="pk_recproject" jdbcType="VARCHAR"/>
</resultMap>
<!--工程项目查询-->
<select id="PayBillEntity_list_base" resultMap="get-PayBillEntity-result" parameterType="com.hzya.frame.seeyon.paybill.entity.PayBillEntity">
select bill_code,id,bill_date,primal_money,pk_oppaccount,pk_supplier,pk_org,pk_balatype,table_name,field_name,send_state from (
select bill_code,m1.id,bill_date,formmain_0236.field0003 as pk_recproject,memo,primal_money,pk_oppaccount,pk_supplier,pk_org,pk_balatype,table_name,field_name,send_state from (
SELECT
body.id as id,
field0001 as bill_code,
@ -27,6 +29,8 @@
field0083 AS pk_supplier,
field0089 AS pk_org,
field0091 AS pk_balatype,
field0090 AS pk_recproject_code,
field0082 AS memo,
'formson_0222' as table_name,
'field0084' as field_name,
field0084 as send_state
@ -43,6 +47,8 @@
field0077 AS pk_supplier,
field0082 AS pk_org,
field0084 AS pk_balatype,
field0083 AS pk_recproject,
field0076 AS memo,
'formson_0210' as table_name,
'field0078' as field_name,
field0078 as send_state
@ -59,13 +65,15 @@
field0057 AS pk_supplier,
field0061 AS pk_org,
field0063 AS pk_balatype,
field0062 AS pk_recproject,
field0056 AS memo,
'formson_0223' as table_name,
'field0058' as field_name,
field0058 as send_state
FROM formmain_0094 main
LEFT JOIN formson_0223 body ON main.id = body.formmain_id
WHERE field0053 IS NOT NULL and finishedflag = '1'
)m1
)m1 left join formmain_0236 on m1.pk_recproject_code = formmain_0236.field0002
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
<if test="queryState != null and queryState != ''"> and send_state is null</if>

2
service/src/main/java/com/hzya/frame/seeyon/paybill/service/impl/PayBillServiceImpl.java
View File

@ -154,6 +154,8 @@ public class PayBillServiceImpl extends BaseService<PaymentEntity,String> implem
body.put("direction","-1");//方向 :1=收;-1=付;
body.put("objecttype","0");//交易对象
body.put("pk_customer",pay.getPkSupplier());//客户
body.put("pk_recproject",pay.getPkRecproject());//收支项目
body.put("memo",pay.getMemo());//摘要
String pkOppaccount = "";
if(StrUtil.isNotEmpty(pay.getPkOppaccount())){
pkOppaccount = pay.getPkOppaccount().replaceAll(" ","");