Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa

ab8c1dbd · 孙昱 · 0e1226ff · c46947c7 · ab8c1dbd
Commit ab8c1dbd authored Sep 21, 2020 by 孙昱
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
+2 -1

No files found.
--- a/order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
+++ b/order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
@@ -209,7 +209,8 @@ public class DeliveryAdapter {
                        deliveryComboProductInfo.setTaxId(StringUtils.isNotEmpty(orderComboProductAddInfoDto.getTaxId()) ? orderComboProductAddInfoDto.getTaxId() : "10");
                        deliveryComboProductInfo.setTaxRate(orderComboProductAddInfoDto.getTax() > 0 ? orderComboProductAddInfoDto.getTax() : 6);
-                        deliveryComboProductInfo.setParentCode(Long.valueOf(comboProduct.getParentProductId().split("_")[0]));
+                        deliveryComboProductInfo.setParentCode(Long.valueOf(comboProduct.getParentProductId().replace("_", "")));
+                        deliveryProductInfo.setProductCode(deliveryComboProductInfo.getParentCode()+"");
                        productInfos.add(deliveryComboProductInfo);
                    });