luminghui
/
sims-order-lxzy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:联调回推问题修改及优化

Browse Source
zkh
路明慧 11 months ago
parent 2407962816
commit 0a56ba37cc
8 changed files with 79 additions and 33 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      order-management-order/src/main/java/com/dxhy/order/consumer/dao/SkOrderMapper.java
  2. 13
      order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/sk/BackDjbh.java
  3. 12
      order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/sk/BackProduct.java
  4. 2
      order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java
  5. 55
      order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java
  6. 9
      order-management-order/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceDataServiceImpl.java
  7. 3
      order-management-order/src/main/resources/mybatis/mapper/SkOrderItemInfoMapper.xml
  8. 15
      order-management-order/src/main/resources/mybatis/mapper/SkOrderMapper.xml

3
order-management-order/src/main/java/com/dxhy/order/consumer/dao/SkOrderMapper.java
Unescape View File

@ -1,6 +1,7 @@
package com.dxhy.order.consumer.dao;
import com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam;
import com.dxhy.order.consumer.modules.bespoke.model.sk.BackDjbh;
import com.dxhy.order.consumer.modules.bespoke.model.sk.BackProduct;
import com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderInfo;
import com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderItemInfo;
@ -18,4 +19,6 @@ public interface SkOrderMapper {
int updateOrder(SkOrderInfo skOrderInfo);
void callProcedure(BackProduct backProduct);
BackDjbh selectBackDjbh(String originDdh);
}

13
order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/sk/BackDjbh.java
Unescape View File

@ -0,0 +1,13 @@
package com.dxhy.order.consumer.modules.bespoke.model.sk;
import lombok.Data;
@Data
public class BackDjbh {
private String djbh;
private String bpmlsNo;
private String bpmNo;
}

12
order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/sk/BackProduct.java
Unescape View File

@ -2,6 +2,8 @@ package com.dxhy.order.consumer.modules.bespoke.model.sk;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class BackProduct {
@ -17,15 +19,15 @@ public class BackProduct {
private String kpr;
private String spsl;
private BigDecimal spsl;
private String dj;
private BigDecimal dj;
private String je;
private BigDecimal je;
private String sl;
private BigDecimal sl;
private String se;
private BigDecimal se;
private String mark;
}

2
order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java
Unescape View File

@ -419,7 +419,7 @@ public class OrderHandleServiceImpl implements OrderHandleService {
public boolean test() {
ByteArrayInputStream utf8Stream = IoUtil.toUtf8Stream("独有英雄驱虎豹，更无豪杰怕熊罴");
boolean flag = ftpProcessor.uploadFile(ftpProperties.getBasePath()+"/test", "poem.txt", utf8Stream);
boolean flag = ftpProcessor.uploadFile(ftpProperties.getBasePath(),"poem.txt", utf8Stream);
return flag;
}

55
order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java
Unescape View File

@ -26,6 +26,7 @@ import com.dxhy.order.consumer.dao.TInvoiceInvmapMapper;
import com.dxhy.order.consumer.modules.bespoke.config.datasource.config.DynamicContextHolder;
import com.dxhy.order.consumer.modules.bespoke.model.req.FileModel;
import com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam;
import com.dxhy.order.consumer.modules.bespoke.model.sk.BackDjbh;
import com.dxhy.order.consumer.modules.bespoke.model.sk.BackProduct;
import com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderInfo;
import com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderItemInfo;
@ -190,34 +191,45 @@ public class SkOrderServiceImpl implements OrderService {
backProduct.setDjbh(orderOriginExtendInfo.getOriginDdh());
backProduct.setMxxh(orderItemInfo.getSphxh());
backProduct.setKprq(DateUtil.formatDate(orderInvoiceInfo.getKprq()));
backProduct.setBz(orderItemInfo.getBz());
backProduct.setKpr(orderInvoiceInfo.getKpr());
backProduct.setSpsl(orderItemInfo.getXmsl());
backProduct.setDj(orderItemInfo.getXmdj());
backProduct.setJe(orderItemInfo.getXmje());
backProduct.setSl(orderItemInfo.getSl());
backProduct.setSe(orderItemInfo.getSe());
backProduct.setBz(orderItemInfo.getBz()==null?"":orderItemInfo.getBz());
backProduct.setKpr(orderInvoiceInfo.getKpr()==null?"":orderInvoiceInfo.getKpr());
backProduct.setSpsl(new BigDecimal(orderItemInfo.getXmsl()));
backProduct.setDj(new BigDecimal(orderItemInfo.getXmdj()));
backProduct.setJe(new BigDecimal(orderItemInfo.getXmje()));
backProduct.setSl(new BigDecimal(orderItemInfo.getSl()));
backProduct.setSe(new BigDecimal(orderItemInfo.getSe()));
backProduct.setMark(ConfigureConstant.KP);
if (ConfigureConstant.STRING_1.equals(orderInvoiceInfo.getKplx())){
backProduct.setDjbh(ddh);
backProduct.setDjbh(orderItemInfo.getByzd2());
backProduct.setMark(ConfigureConstant.CH);
}
DynamicContextHolder.push(orderInvoiceInfo.getXhfNsrsbh());
log.info("调用存储过程参数：{}", JSON.toJSONString(backProduct));
skOrderMapper.callProcedure(backProduct);
//回写创建表
DynamicContextHolder.push(ConfigureConstant.MAIN);
NewTable newTable = new NewTable();
newTable.setCDLCode(orderOriginExtendInfo.getOriginDdh());
newTable.setInvoiceCode(orderInvoiceInfo.getSdfphm());
newTable.setInvoiceTime(orderInvoiceInfo.getKprq());
newTable.setInvoiceAmount(orderInvoiceInfo.getKphjje());
newTable.setInvoicePhoto(fileModel.getFilePath());
newTable.setInvoiceFilename(fileModel.getFileName());
newTable.setOperater(orderInvoiceInfo.getKpr());
newTable.setOperateDate(orderInvoiceInfo.getKprq());
tInvoiceInvmapMapper.deleteBackMsg(newTable.getCDLCode());
tInvoiceInvmapMapper.insertBackMsg(newTable);
if (ConfigureConstant.STRING_0.equals(orderInvoiceInfo.getKplx())){
//回写创建表
DynamicContextHolder.push(orderInvoiceInfo.getXhfNsrsbh());
BackDjbh backDjbh = skOrderMapper.selectBackDjbh(orderItemInfo.getByzd2());
NewTable newTable = new NewTable();
if (backDjbh != null){
newTable.setCDLCode(backDjbh.getDjbh());
newTable.setBpmNo(backDjbh.getBpmNo());
newTable.setBpmlsNo(backDjbh.getBpmlsNo());
}
newTable.setInvoiceNo(orderInvoiceInfo.getSdfphm());
newTable.setInvoiceTime(orderInvoiceInfo.getKprq());
newTable.setInvoiceAmount(orderInvoiceInfo.getKphjje());
newTable.setInvoicePhoto(fileModel.getFilePath());
newTable.setInvoiceFilename(fileModel.getFileName());
newTable.setOperater(orderInvoiceInfo.getKpr());
newTable.setOperateDate(orderInvoiceInfo.getKprq());
DynamicContextHolder.push(ConfigureConstant.MAIN);
tInvoiceInvmapMapper.deleteBackMsg(newTable.getCDLCode());
tInvoiceInvmapMapper.insertBackMsg(newTable);
}
}
}
@ -341,7 +353,6 @@ public class SkOrderServiceImpl implements OrderService {
taxAmount = DecimalCalculateUtil.bigDecimalAdd(taxAmount, orderItemInfo.getSe(), ConfigureConstant.INT_2);
//设置红字回写订单号
ddmxxxBO.setBYZD2(orderItemInfo.getXgdjbh());
ddtxxBO.setBYZD1(orderItemInfo.getXgdjbh());
ddmxxxBOList.add(ddmxxxBO);
}
//金额、税额、价税合计

9
order-management-order/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceDataServiceImpl.java
Unescape View File

@ -1,6 +1,7 @@
package com.dxhy.order.consumer.modules.manager.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson2.JSON;
import com.dxhy.base.common.constant.ConfigureConstant;
import com.dxhy.base.common.constant.OrderInfoEnum;
import com.dxhy.base.common.model.OrderInfo;
@ -14,6 +15,7 @@ import com.dxhy.order.baseservice.model.OrderInvoiceInfo;
import com.dxhy.order.baseservice.model.queue.CommonTsMqData;
import com.dxhy.order.baseservice.model.queue.FpTsMqData;
import com.dxhy.order.baseservice.utils.OrderCommonUtils;
import com.dxhy.order.consumer.modules.bespoke.service.OrderHandleService;
import com.dxhy.order.consumer.modules.manager.model.ProcessInvoiceData;
import com.dxhy.order.consumer.modules.manager.service.InvoiceDataService;
import com.dxhy.order.consumer.modules.order.service.OrderInfoService;
@ -61,6 +63,9 @@ public class InvoiceDataServiceImpl implements InvoiceDataService {
@Resource
private OrderInvoiceInfoService orderInvoiceInfoService;
@Resource
private OrderHandleService orderHandleService;
/**
* 发票状态手动回推
*/
@ -107,7 +112,9 @@ public class InvoiceDataServiceImpl implements InvoiceDataService {
commonTsMqData.setNsrsbh(orderInvoiceInfo.getXhfNsrsbh());
commonTsMqData.setEntId(orderInvoiceInfo.getEntId());
commonTsMqData.setFpTsMqData(fpTsMqData);
rabbitMqSendMessageService.autoSendRabbitMqMessageForBusiness(NsrQueueEnum.PUSH_MESSAGE.getValue(), JsonUtils.getInstance().toJsonString(commonTsMqData));
// rabbitMqSendMessageService.autoSendRabbitMqMessageForBusiness(NsrQueueEnum.PUSH_MESSAGE.getValue(), JsonUtils.getInstance().toJsonString(commonTsMqData));
orderHandleService.backMsg(JSON.toJSONString(commonTsMqData));
successCount++;
}

3
order-management-order/src/main/resources/mybatis/mapper/SkOrderItemInfoMapper.xml
Unescape View File

@ -14,10 +14,11 @@
<result property="se" column="se"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="xgdjbh" column="xgdjbh"/>
</resultMap>
<sql id="selectSkOrderItemInfoVo">
select id, order_id, cpmc, xh, cpdw, cpsl, hsdj, hsje, sl, se, create_time, update_time from sk_order_item_info
select id, order_id, cpmc, xh, cpdw, cpsl, hsdj, hsje, sl, se, create_time, update_time,xgdjbh from sk_order_item_info
</sql>
<insert id="insertSkOrderItemInfo" parameterType="com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderItemInfo">

15
order-management-order/src/main/resources/mybatis/mapper/SkOrderMapper.xml
Unescape View File

@ -41,8 +41,17 @@
</update>
<update id="callProcedure" parameterType="com.dxhy.order.consumer.modules.bespoke.model.sk.BackProduct">
{ call js_jiekou (
#{fphm},#{djbh},#{mxxh},#{kprq},#{bz},#{kpr},#{spsl},#{dj},#{je},#{sl},#{se},#{mark}
)}
call js_jiekou (
#{fphm},#{djbh},#{mxxh},#{kprq},#{bz},#{kpr},#{spsl,jdbcType=DECIMAL,mode=IN},#{dj,jdbcType=DECIMAL,mode=IN},#{je,jdbcType=DECIMAL,mode=IN},#{sl,jdbcType=DECIMAL,mode=IN},#{se,jdbcType=DECIMAL,mode=IN},#{mark}
)
</update>
<select id="selectBackDjbh" resultType="com.dxhy.order.consumer.modules.bespoke.model.sk.BackDjbh" parameterType="java.lang.String">
select XGDJBH as djbh,
DDHZID as bpmNo,
DDMXID as bpmlsNo
from V_INVOICE_BPMMAP
where DJBH = #{originDdh}
</select>
</mapper>

Write Preview
Loading…
Cancel
Save