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

Merge remote-tracking branch 'origin/release' into release

Browse Source
release
zhenghaiyang@ele-cloud.com 2 years ago
parent 5e30ee8c31 03edd3a97d
commit 051e3a789b
9 changed files with 90 additions and 48 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. 29
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
  2. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
  3. 59
      order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
  4. 11
      order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java
  5. 13
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
  6. 3
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderItemInfoService.java
  7. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderItemInfoServiceImpl.java
  8. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
  9. 3
      order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml

29
order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
Unescape View File

@ -314,7 +314,7 @@ public class BuyerServiceImpl implements BuyerService {
buyerEntity1.setBuyerCode(buyerCode);
List<BuyerEntity> entities = buyerMapper.selectBuyerByBuyerEntity(buyerEntity1, shList1);
if(entities != null && entities.size() > 0){
return buyerEntities.get(0);
return entities.get(0);
}
return null;
}
@ -413,6 +413,11 @@ public class BuyerServiceImpl implements BuyerService {
/**
* 根据入参进行判断是新增还是修改
*/
buyerEntity.setAddress("");
buyerEntity.setPhone("");
buyerEntity.setBankNumber("");
buyerEntity.setBankOfDeposit("");
Boolean isAdd = false;
if(StringUtils.isBlank(buyerEntity.getId())){
isAdd = true;
@ -433,7 +438,9 @@ public class BuyerServiceImpl implements BuyerService {
}
// 处理MDM默认银行账户等信息
//判断是否存在默认银行信息
Boolean isDefaultMark = true;
if(isAdd && existBuyer != null){
return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999);
}
String buyerId = baseService.getGenerateShotKey();
if (CollectionUtil.isNotEmpty(buyerEntity.getBuyerEntityDetail())) {
for (BuyerEntityDetail t : buyerEntity.getBuyerEntityDetail()) {
@ -451,27 +458,19 @@ public class BuyerServiceImpl implements BuyerService {
buyerEntity.setPhone(t.getPhone());
buyerEntity.setBankNumber(t.getBankAccount());
buyerEntity.setBankOfDeposit(t.getBankName());
isDefaultMark = false;
}
}
}
buyerMapper.deleteBuyerDetail(buyerEntity.getId());
if(buyerEntity.getBuyerEntityDetail() != null && buyerEntity.getBuyerEntityDetail().size()>0){
buyerMapper.batchInsertBuyerDetail(buyerEntity.getBuyerEntityDetail());
}
if(isAdd && existBuyer != null){
return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999);
}
if (existBuyer != null) {//StringUtils.isNotBlank(buyerEntity.getId())
if (existBuyer != null) {//StringUtils.isNotBlank(buyerEntity.getId())修改客户信息
buyerEntity.setModifyTime(new Date());
if(isDefaultMark){
buyerEntity.setAddress("");
buyerEntity.setPhone("");
buyerEntity.setBankNumber("");
buyerEntity.setBankOfDeposit("");
}
//更新明细表，最好的办法是先删除后新增
int i = buyerMapper.updateBuyer(buyerEntity, shList);
@ -479,8 +478,7 @@ public class BuyerServiceImpl implements BuyerService {
r.put("message", "修改失败").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999);
}
} else {
//新增购方信息
} else { //新增购方信息
if (StringUtils.isBlank(buyerEntity.getBuyerCode())) {
buyerEntity.setBuyerCode(baseService.getGenerateShotKey());
}
@ -621,6 +619,7 @@ public class BuyerServiceImpl implements BuyerService {
queryBuyerEntity.setTaxpayerCode(buyerEntity.getTaxpayerCode());
queryBuyerEntity.setPurchaseName(buyerEntity.getPurchaseName());
}
queryBuyerEntity.setEntId(buyerEntity.getDeptId());
List<String> shList = new ArrayList<>();
shList.add(buyerEntity.getXhfNsrsbh());

2
order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
Unescape View File

@ -622,7 +622,7 @@ public class CommodityServiceImpl implements CommodityService {
Map<String,String> map = new HashMap<>();
// map.put("productName", xmmc);
map.put("zxbm", receiveSpxxReq.getZxbm());
map.put("entId",commodityCodeCheckQuery.getDeptId());
map.put("entId",receiveSpxxReq.getEntId());
log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map);
List<CommodityCodeEntity> commodityCodeEntityList = commodityMapper.queryProductList(map, null);

59
order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
Unescape View File

@ -906,33 +906,45 @@
<select id="selectBuyer" parameterType="String" resultMap="BaseResultMap">
<bind name="dataType" value="${dataType}"/>
SELECT
id,
taxpayer_code,
purchase_name,
address,
phone,
bank_of_deposit,
bank_number,
email,
sjh,
remarks,
create_user_id,
bmi.id,
bmi.taxpayer_code,
bmi.purchase_name,
bmi.address,
bmi.phone,
bmi.bank_of_deposit,
bmi.bank_number,
bmi.email,
bmi.sjh,
bmi.remarks,
bmi.create_user_id,
<if test="dataType == 0">
DATE_FORMAT(create_time,'%Y-%m-%d') as createTime,
DATE_FORMAT(modify_time,'%Y-%m-%d') as modifyTime,
DATE_FORMAT(bmi.create_time,'%Y-%m-%d') as createTime,
DATE_FORMAT(bmi.modify_time,'%Y-%m-%d') as modifyTime,
</if>
<if test="dataType == 1">
to_char(create_time,'yyyy-MM-dd') as createTime,
to_char(modify_time,'yyyy-MM-dd') as modifyTime,
to_char(bmi.create_time,'yyyy-MM-dd') as createTime,
to_char(bmi.modify_time,'yyyy-MM-dd') as modifyTime,
</if>
modify_user_id,
ghf_qylx,
buyer_code,
status,
sync_order,
ent_id
bmi.modify_user_id,
bmi.ghf_qylx,
bmi.xhf_nsrsbh,
bmi.xhf_mc,
bmi.buyer_code,
bmi.create_time,
bmi.status,
bmi.sync_order,
bmi.ent_id,
bmid.consumer_id,
bmid.buyer_manage_id,
bmid.bank_name,
bmid.bank_account,
bmid.address as bmid_address,
bmid.phone as bmid_phone,
bmid.default_mark,
bmid.create_user,
bmid.update_user
FROM
buyer_manage_info
buyer_manage_info bmi left join buyer_manage_info_detail bmid on bmi.id = bmid.buyer_manage_id
<where>
<if test="shList != null and shList.size() == 0">
and xhf_nsrsbh = ''
@ -1100,6 +1112,9 @@
<if test="buyer.purchaseName != null and buyer.purchaseName != ''">
and purchase_name = #{buyer.purchaseName,jdbcType=VARCHAR}
</if>
<if test="buyer.entId != null and buyer.entId != ''">
and ent_id = #{buyer.entId,jdbcType=VARCHAR}
</if>
<if test="buyer.buyerCode != null and buyer.buyerCode != ''">
and buyer_code = #{buyer.buyerCode,jdbcType=VARCHAR}
</if>

11
order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java
Unescape View File

@ -111,7 +111,7 @@ public class OrderSaveSpxxHandler implements BaseListener {
List<String> shList = NsrsbhUtils.transShListByNsrsbh(orderInvoiceInfo.getXhfNsrsbh());
List<OrderItemInfo> orderItemInfoList = orderItemInfoService.selectOrderItemInfoByOrderId(orderInvoiceInfo.getOrderInfoId(), shList);
List<OrderItemInfo> updateZnfmList = new ArrayList<>();
if (ObjectUtil.isNotEmpty(orderItemInfoList)) {
List<ReceiveSpxxReq> receiveSpxxReqList = new ArrayList<>();
for (OrderItemInfo orderItemInfo : orderItemInfoList) {
@ -120,8 +120,17 @@ public class OrderSaveSpxxHandler implements BaseListener {
receiveSpxxReq.setXhfMc(orderInvoiceInfo.getXhfMc());
receiveSpxxReq.setEntId(userInfoService.getUser() != null ? userInfoService.getUser().getDeptId():orderInvoiceInfo.getEntId());
receiveSpxxReqList.add(receiveSpxxReq);
//更新是否为只能赋码
if("1".equals(orderItemInfo.getZnfm())){
OrderItemInfo orderItemInfo1 = new OrderItemInfo();
orderItemInfo1.setId(orderItemInfo.getId());
orderItemInfo1.setZnfm("0");
updateZnfmList.add(orderItemInfo1);
}
}
//事务控制
commodityService.saveCommodityCodeEntity(receiveSpxxReqList);
orderItemInfoService.updateOrderItemId(updateZnfmList);
}
}

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

@ -1365,7 +1365,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
detail.setZBHSJEY(f.getJE());
detail.setZZSEY(f.getSE());
detail.setZHSJEY(new BigDecimal(f.getJE()).add(new BigDecimal(f.getSE())).toString());
detail.setZZDJFP((new BigDecimal(f.getJE()).add(new BigDecimal(f.getSE())).divide(new BigDecimal(f.getSPSL()),8, BigDecimal.ROUND_HALF_EVEN).toString()));
if(StrUtil.isBlank(f.getDJ())){
detail.setZZDJFP("");
}else {
detail.setZZDJFP(new BigDecimal(f.getDJ()).multiply(new BigDecimal(f.getSL()).add(BigDecimal.ONE)).setScale(ConfigureConstant.INT_8,BigDecimal.ROUND_HALF_EVEN).toString());
}
detail.setINVOICEDATE(ddfpxx.getKPRQ());
detail.setINVOICETYPE(ddfpxx.getFPLXDM());
detail.setZHWMC(f.getXMMC());
@ -1400,8 +1404,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
fpzftsReqSap.setZFPHM(zffptsV5.getFPHM());
//0 是正常 1是作废
fpzftsReqSap.setZFPZT(ConfigureConstant.STRING_1);
//fpzftsReqSap.setZJSDH(orderInvoiceInfo.getDdh());
fpzftsReqSap.setZBZDH(orderProcessInfo.getBzdh());
if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(orderProcessInfo.getXtly())){
fpzftsReqSap.setZJSDH(orderProcessInfo.getOriginDdh());
}else {
fpzftsReqSap.setZBZDH(orderProcessInfo.getBzdh());
}
IsInput isInput = new IsInput();
isInput.setSYSID(OrderInfoEnum.SYS_SIGN_FP.getKey());
isInput.setIFYWID(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPZFTS.getKey());

3
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderItemInfoService.java
Unescape View File

@ -1,6 +1,7 @@
package com.dxhy.order.consumer.modules.order.service;
import com.dxhy.order.model.OrderItemInfo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -38,4 +39,6 @@ public interface OrderItemInfoService {
*/
int insertOrderItemByList(List<OrderItemInfo> orderItemInfos);
int updateOrderItemId(List<OrderItemInfo> resultOrderItemList);
}

6
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderItemInfoServiceImpl.java
Unescape View File

@ -3,6 +3,7 @@ package com.dxhy.order.consumer.modules.order.service.impl;
import com.dxhy.order.model.OrderItemInfo;
import com.dxhy.order.consumer.modules.order.service.OrderItemInfoService;
import com.dxhy.order.invoice.module.invoice.dao.OrderItemInfoMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -35,4 +36,9 @@ public class OrderItemInfoServiceImpl implements OrderItemInfoService {
return orderItemInfoMapper.insertOrderItemByList(orderItemInfos);
}
@Override
public int updateOrderItemId(@Param("list") List<OrderItemInfo> resultOrderItemList){
return orderItemInfoMapper.updateOrderItemId(resultOrderItemList);
}
}

12
order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
Unescape View File

@ -211,7 +211,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
private static void structureBuyerEntity(BuyerEntity buyerEntity,MdmGmfxxtbReqBO tempMdmGmfxxtbReqBO){
buyerEntity.setTaxpayerCode(tempMdmGmfxxtbReqBO.getDESC14());
buyerEntity.setPurchaseName(tempMdmGmfxxtbReqBO.getDESC1());
buyerEntity.setPhone(tempMdmGmfxxtbReqBO.getDESC27());
buyerEntity.setPhone(tempMdmGmfxxtbReqBO.getDESC26());
buyerEntity.setSjh(tempMdmGmfxxtbReqBO.getDESC27());
buyerEntity.setEmail(tempMdmGmfxxtbReqBO.getDESC29());
@ -220,10 +220,10 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
buyerEntity.setModifyTime(new Date());
// 处理开户行银行
List<BuyerEntityDetail> buyerEntityDetails = new ArrayList<>();
String buyerAddress = "";
buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC22()) ? "" : tempMdmGmfxxtbReqBO.getDESC22());
buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC23()) ? "" : tempMdmGmfxxtbReqBO.getDESC23());
buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC24()) ? "" : tempMdmGmfxxtbReqBO.getDESC24());
String buyerAddress = StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC24()) ? "" : tempMdmGmfxxtbReqBO.getDESC24();
// buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC22()) ? "" : tempMdmGmfxxtbReqBO.getDESC22());
// buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC23()) ? "" : tempMdmGmfxxtbReqBO.getDESC23());
// buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC24()) ? "" : tempMdmGmfxxtbReqBO.getDESC24());
buyerEntity.setAddress(buyerAddress);
if (tempMdmGmfxxtbReqBO.getMULTICODE() != null && !CollectionUtils.isEmpty(tempMdmGmfxxtbReqBO.getMULTICODE().getVALUELIST())) {
@ -244,7 +244,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
}
buyerEntityDetail.setBankAccount(valuelistBO.getDESC4());
buyerEntityDetail.setBankName(valuelistBO.getDESC3());
buyerEntityDetail.setPhone(tempMdmGmfxxtbReqBO.getDESC27());
buyerEntityDetail.setPhone(StringUtils.isNotBlank(buyerEntity.getPhone())?buyerEntity.getPhone():"");
buyerEntityDetail.setAddress(finalBuyerAddress);
buyerEntityDetail.setBuyerManageId(buyerEntity.getId());
buyerEntityDetails.add(buyerEntityDetail);

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

@ -283,6 +283,9 @@
<if test="item.xmdw != null ">
xmdw = #{item.xmdw,jdbcType=VARCHAR},
</if>
<if test="item.znfm != null ">
znfm = #{item.znfm,jdbcType=VARCHAR},
</if>
</set>
<where>
id = #{item.id,jdbcType=VARCHAR}

Write Preview
Loading…
Cancel
Save