Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -1870,17 +1870,17 @@ public class GoodsServiceImpl implements GoodsService {
         for (GoodsEntity goodsEntity : allGoodsList) {
             // 同步过海关商品编码才可以算税率
             if ("1".equals(goodsEntity.getIsSyncHsCode())) {
-                Map<String, Object> goodsDetailMap = calculateGoodsDetail(goodsEntity.getProdBarcode(), storeId);
-                if (Objects.nonNull(goodsDetailMap)) {
-                    GoodsDetailsDto goods = (GoodsDetailsDto) goodsDetailMap.get("goods");
+//                Map<String, Object> goodsDetailMap = calculateGoodsDetail(goodsEntity.getProdBarcode(), storeId);
+//                if (Objects.nonNull(goodsDetailMap)) {
+//                    GoodsDetailsDto goods = (GoodsDetailsDto) goodsDetailMap.get("goods");
                     // 顾客给的钱 就是税后价
-                    BigDecimal actualPaymentAmount = goods.getActualPaymentAmount(); //随便拿一个门店的当前时间的价格,如果有活动价会使用活动价
+//                    BigDecimal actualPaymentAmount = goods.getActualPaymentAmount(); //随便拿一个门店的当前时间的价格,如果有活动价会使用活动价
 //                    BigDecimal calculateTax = CalculateTax.calculateTax(goodsEntity, actualPaymentAmount);// 税费
 //                    BigDecimal goodsRate = calculateTax.divide(actualPaymentAmount, 4, BigDecimal.ROUND_HALF_UP);
                     BigDecimal goodsRate =CalculateTax.calculateGoodsRate(goodsEntity);
                     goodsEntity.setGoodsRate(goodsRate);
                     goodsDao.update(goodsEntity);
-                }
+//                }
             }
         }
     }