提交代码

dev-discount
胡锐 3 years ago
parent 1ade26ce72
commit 980ceb8aa6
  1. 2
      hai-cweb/src/main/java/com/cweb/config/AuthConfig.java
  2. 1
      hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java
  3. 2
      hai-cweb/src/main/java/com/cweb/controller/HighTestController.java

@ -99,6 +99,8 @@ public class AuthConfig implements WebMvcConfigurer {
.excludePathPatterns("/discount/getDiscountByQrCode") .excludePathPatterns("/discount/getDiscountByQrCode")
.excludePathPatterns("/discount/getDiscountById") .excludePathPatterns("/discount/getDiscountById")
.excludePathPatterns("/discount/getCouponByDiscount") .excludePathPatterns("/discount/getCouponByDiscount")
.excludePathPatterns("/discountPackage/getDiscountPackageList")
.excludePathPatterns("/discountPackage/getDiscountPackageDetail")
.excludePathPatterns("/discount/getDiscountByDiscountAgentId") .excludePathPatterns("/discount/getDiscountByDiscountAgentId")
.excludePathPatterns("/highMerchantStore/getMerchantStoreById") .excludePathPatterns("/highMerchantStore/getMerchantStoreById")
.excludePathPatterns("/highMerchantStore/getStoreListByCoupon") .excludePathPatterns("/highMerchantStore/getStoreListByCoupon")

@ -238,6 +238,7 @@ public class HighOrderController {
childOrder.setGoodsSpecName("默认"); childOrder.setGoodsSpecName("默认");
childOrder.setTotalPrice(childOrder.getGoodsPrice().multiply(new BigDecimal(childOrder.getSaleCount().toString()))); childOrder.setTotalPrice(childOrder.getGoodsPrice().multiply(new BigDecimal(childOrder.getSaleCount().toString())));
// childOrder.setTotalPrice(childOrder.getGoodsActualPrice().multiply(new BigDecimal(childOrder.getSaleCount().toString())));
} }
if (childOrder.getGoodsType() == 7) { if (childOrder.getGoodsType() == 7) {

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save