diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java index 62b7ed0..9664c27 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java @@ -238,6 +238,12 @@ public class SkOrderServiceImpl implements OrderService { skOrderInfo.setCreateTime(now); skOrderInfo.setHsje(hsje.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString()); skOrderInfo.setSe(se.setScale(ConfigureConstant.INT_2,RoundingMode.HALF_UP).toPlainString()); + + String fplx = ConfigureConstant.STRING_002; + if ("增值税专用发票".equals(skOrderInfo.getFplx())){ + fplx = ConfigureConstant.STRING_001; + } + skOrderInfo.setFplx(fplx); skOrderInfoMapper.insertSkOrderInfo(skOrderInfo); return ConfigureConstant.INT_1; diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java index 655f207..ae1f4f1 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java @@ -124,6 +124,7 @@ public class YyOrderServiceImpl implements OrderService { } @Override + @Transactional public R delOrder(ReqParam reqParam) { int count = yyOrderInfoMapper.delOrder(reqParam); yyOrderItemInfoMapper.delOrder(reqParam.getIds()); diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java index a3b1a6f..032b468 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java @@ -662,14 +662,14 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { List commodityCodeEntityList = commodityService.queryCommodityInfoList(pageSpxxReq, NsrsbhUtils.transShListByXhfNsrsbh(xhfNsrsbh)); if (ObjectUtil.isNotEmpty(commodityCodeEntityList)) { - if (commodityCodeEntityList.size() > 1) { - log.error("{}根据商品名称查询到多个商品信息,商品名称:{}", LOGGER_MSG, item.getXmmc()); - errorStr.append(errorMsg) - .append(ConfigureConstant.STRING_UNDERLINE) - .append(OrderValidateEnum.INVOICE_SPBM_QUERY_NULL.getMessage()) - .append("\r\n"); - continue; - } +// if (commodityCodeEntityList.size() > 1) { +// log.error("{}根据商品名称查询到多个商品信息,商品名称:{}", LOGGER_MSG, item.getXmmc()); +// errorStr.append(errorMsg) +// .append(ConfigureConstant.STRING_UNDERLINE) +// .append(OrderValidateEnum.INVOICE_SPBM_QUERY_NULL.getMessage()) +// .append("\r\n"); +// continue; +// } CommodityCodeEntity commodityCodeEntity = commodityCodeEntityList.get(0); completeCommodityMessageBySpid(item, commodityCodeEntity, fpzlDm, taxEquipmentInfo); } else { diff --git a/order-management-order/src/main/resources/mybatis/mapper/SkOrderMapper.xml b/order-management-order/src/main/resources/mybatis/mapper/SkOrderMapper.xml index f3f7564..3c15b2c 100644 --- a/order-management-order/src/main/resources/mybatis/mapper/SkOrderMapper.xml +++ b/order-management-order/src/main/resources/mybatis/mapper/SkOrderMapper.xml @@ -30,7 +30,8 @@ hsje, sl, xh, - xgdjbh + xgdjbh, + se from v_invoice_detail_fp where xsddm = #{xsddm}