Merge remote-tracking branch 'origin/developerD' into developerD

src/main/java/com/caimei365/order/service/impl/CartSellerServiceImpl.java

@@ -723,11 +723,7 @@ public class CartSellerServiceImpl implements CartSellerService {
                         shop.setPostageFlag(0);
                     }
                     shop.setPostage(shopPostage.get());
-                    if (0 != coldChain.get()) {
-                        shop.setIsColdChina(true);
-                    } else {
-                        shop.setIsColdChina(false);
-                    }
+
                     // 只有冷链费商品 运费为0
                     /*if (null != townId) {
                         if (1 == shop.getDesignatedFlag()) {
@@ -739,6 +735,11 @@ public class CartSellerServiceImpl implements CartSellerService {
                     coldChain.set(0 == shop.getPostage() ? 0 : coldChain.get());
                     shop.setColdChain(coldChain.get());
                     shop.setPostage(MathUtil.sub(shop.getPostage(),coldChain.get()).doubleValue());
+                    if (0 != coldChain.get()) {
+                        shop.setIsColdChina(true);
+                    } else {
+                        shop.setIsColdChina(false);
+                    }
                     // 供应商总金额
                     shopPrice.set(MathUtil.add(MathUtil.add(shopPrice.get(), shop.getPostage()), coldChain.get()).doubleValue());
                     if (shopKindCount.get() > 0) {

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -822,6 +822,9 @@ public class SubmitServiceImpl implements SubmitService {
                                     if (!promotionsIds.contains(promotions.getId())) {
                                         promotionsIds.add(promotions.getId());
                                         promotions.setPromotionsId(promotions.getId());
+                                        if (taxFlag) {
+                                            promotions.setTouchPrice( MathUtil.add(promotions.getTouchPrice(), MathUtil.div(MathUtil.mul(promotions.getTouchPrice(), product.getTaxRate()), 100, 2)).doubleValue());
+                                        }
                                         promotionList.add(promotions);
                                     }
                                     product.setOrderPromotionsId(promotions.getId());
@@ -840,6 +843,9 @@ public class SubmitServiceImpl implements SubmitService {
                                 if (!promotionsIds.contains(promotions.getId())) {
                                     promotionsIds.add(promotions.getId());
                                     promotions.setPromotionsId(promotions.getId());
+                                    if (taxFlag) {
+                                        promotions.setTouchPrice( MathUtil.add(promotions.getTouchPrice(), MathUtil.div(MathUtil.mul(promotions.getTouchPrice(), product.getTaxRate()), 100, 2)).doubleValue());
+                                    }
                                     promotionList.add(promotions);
                                 } else {
                                     PromotionsVo finalPromotions = promotions;