Merge branch 'release' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@@ -68,6 +68,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -179,6 +180,8 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     @Resource
     private CommodityMapper commodityMapper;
 
+    DecimalFormat format = new DecimalFormat("#.###");
+
     @Override
     public PageUtils selectOrderInfo(Map<String, Object> map, List<String> shList, List<String> entList) {
         return orderProcessService.selectOrderInfo(map, shList, entList);
@@ -1936,9 +1939,11 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         if(items.size() > 0){
             orderItemInfoMapper.updateOrderItemId(items);
         }
+        if(sb.length() == 0){
+            return R.ok();
+        }
         String substring = sb.substring(0, sb.length() - 1) + "税编有误请检查";
-
-        return sb.length() == 0 ? R.ok() :R.error(substring);
+        return R.error(substring);
     }
 
     private CommodityCodeEntity buildCommodity(OrderItemInfo itemInfo,OrderInfoVo orderInfoVo,Map<String, TaxClassCodeEntity> spbm ) throws Exception{
@@ -1956,7 +1961,8 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         comm.setZxbm(StringUtils.isNotBlank(itemInfo.getZxbm())?itemInfo.getZxbm():comm.getId());
         comm.setSpsm(taxClassCodeEntity.getSm());
         comm.setSpjm("");
-        comm.setSl(itemInfo.getSl());//不需要转换%
+        String sl = itemInfo.getSl().replace("%", "");
+        comm.setSl(format.format(new BigDecimal("1.3").divide(new BigDecimal("100"), 3, RoundingMode.HALF_UP)));//不需要转换%
         comm.setGgxh(StringUtils.isNotBlank(itemInfo.getGgxh())?BaseServiceBeanTransitionUtils.ggxhTransition(itemInfo.getGgxh()):"");//切除40
         comm.setXmdw(itemInfo.getXmdw());
         comm.setXmdj(StringUtils.isNotBlank(itemInfo.getXmdj())?itemInfo.getXmdj():"");

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java

@@ -1869,10 +1869,15 @@ public class SpecialInvoiceServiceImpl implements SpecialInvoiceService {
                     }
 
                     //如果同步下来的结果与已有的结果不一致的话 更新最新的审核结果
-                    if (!responseHzfpsqbsc.getStatus_CODE().equals(specialInvoiceReversal.getStatusCode())) {
+                    if (!responseHzfpsqbsc.getXXBZT().equals(specialInvoiceReversal.getStatusCode())||!responseHzfpsqbsc.getStatus_CODE().equals(specialInvoiceReversal.getStatusCode())) {
                         updateSpecialEntity.setXxbbh(responseHzfpsqbsc.getXxbbh());
-                        updateSpecialEntity.setStatusCode(responseHzfpsqbsc.getStatus_CODE());
-                        updateSpecialEntity.setStatusMessage(responseHzfpsqbsc.getStatus_MESSAGE());
+                        if(StringUtils.isNotBlank(responseHzfpsqbsc.getStatus_CODE())){
+                            updateSpecialEntity.setStatusCode(responseHzfpsqbsc.getStatus_CODE());
+                            updateSpecialEntity.setStatusMessage(responseHzfpsqbsc.getStatus_MESSAGE());
+                        }else{
+                            updateSpecialEntity.setStatusCode(responseHzfpsqbsc.getXXBZT());
+                            updateSpecialEntity.setStatusMessage(responseHzfpsqbsc.getZTMX());
+                        }
                         updateSpecialEntity.setEditorId(operatorId);
                         updateSpecialEntity.setEditorName(operatorName);
                         updateSpecialEntity.setId(specialInvoiceReversal.getId());

order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml

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