diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java index c07acbce..3f517344 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java @@ -469,6 +469,8 @@ public class BuyerServiceImpl implements BuyerService { if(StringUtils.isBlank(buyerEntity.getBuyerCode())||"0000000000".equals(buyerEntity.getBuyerCode())){ String format = String.format("%s%s", sdf.format(new Date()), String.format("%6s", String.valueOf(new Random().nextInt(1000000))).replace(' ', '0')); buyerEntity.setBuyerCode(format); + }else{ + buyerEntity.setBuyerCode(String.format("%10s", buyerEntity.getBuyerCode()).replace(' ', '0')); } if (CollectionUtil.isNotEmpty(buyerEntity.getBuyerEntityDetail())) { Map collect = buyerEntity.getBuyerEntityDetail().stream().sorted((t1,t2)->Integer.valueOf(t2.getDefaultMark()) - Integer.valueOf(t1.getDefaultMark())).collect(Collectors.toMap(t -> t.getAddress() + t.getPhone() + t.getBankName() + t.getBankAccount(), t -> t,(t1, t2) -> t2)); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index b268daa4..c3e3e455 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSONObject; import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity; +import com.dxhy.order.baseservice.module.buyer.model.BuyerEntityDetail; import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxCommonBO; import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxtbReqBO; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; @@ -2334,9 +2335,17 @@ public class BeanTransitionUtils { */ public static BuyerEntity createBuyerEntity(OrderInfo orderInfo, String ghfBm) { BuyerEntity buyerEntity = new BuyerEntity(); + BuyerEntityDetail entityDetail = new BuyerEntityDetail(); + entityDetail.setAddress(orderInfo.getGhfDz()); + entityDetail.setPhone(orderInfo.getGhfDh()); + entityDetail.setBankName(orderInfo.getGhfYh()); + entityDetail.setBankAccount(orderInfo.getGhfZh()); + entityDetail.setDefaultMark("0"); + entityDetail.setCreateTime(new Date()); /** * 购方编码 */ + buyerEntity.setBuyerEntityDetail(Arrays.asList(entityDetail)); buyerEntity.setBuyerCode(ghfBm); /** * 纳税人识别号