|
@@ -33,7 +33,10 @@ import com.sqx.modules.goods.dao.GoodsDao;
|
|
|
import com.sqx.modules.goods.dao.GoodsShopDao;
|
|
import com.sqx.modules.goods.dao.GoodsShopDao;
|
|
|
import com.sqx.modules.goods.dao.GoodsShopRelevancyDao;
|
|
import com.sqx.modules.goods.dao.GoodsShopRelevancyDao;
|
|
|
import com.sqx.modules.goods.dao.GoodsSkuDao;
|
|
import com.sqx.modules.goods.dao.GoodsSkuDao;
|
|
|
-import com.sqx.modules.goods.entity.*;
|
|
|
|
|
|
|
+import com.sqx.modules.goods.entity.Goods;
|
|
|
|
|
+import com.sqx.modules.goods.entity.GoodsShop;
|
|
|
|
|
+import com.sqx.modules.goods.entity.GoodsShopRelevancy;
|
|
|
|
|
+import com.sqx.modules.goods.entity.GoodsSku;
|
|
|
import com.sqx.modules.message.dao.MessageInfoDao;
|
|
import com.sqx.modules.message.dao.MessageInfoDao;
|
|
|
import com.sqx.modules.message.entity.MessageInfo;
|
|
import com.sqx.modules.message.entity.MessageInfo;
|
|
|
import com.sqx.modules.order.dao.AppOrderDao;
|
|
import com.sqx.modules.order.dao.AppOrderDao;
|
|
@@ -66,7 +69,11 @@ import java.text.SimpleDateFormat;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.LocalTime;
|
|
import java.time.LocalTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
import java.time.format.DateTimeFormatter;
|
|
|
-import java.util.*;
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
|
+import java.util.Calendar;
|
|
|
|
|
+import java.util.Date;
|
|
|
|
|
+import java.util.HashMap;
|
|
|
|
|
+import java.util.List;
|
|
|
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
|
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
@@ -678,7 +685,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
BigDecimal exemptMinMoney = goodsShop.getExemptMinMoney() != null ? goodsShop.getExemptMinMoney() : BigDecimal.ZERO;
|
|
BigDecimal exemptMinMoney = goodsShop.getExemptMinMoney() != null ? goodsShop.getExemptMinMoney() : BigDecimal.ZERO;
|
|
|
|
|
|
|
|
// 店铺开启了配送费满减
|
|
// 店铺开启了配送费满减
|
|
|
- if ("0".equals(enableFullReductionFlag)) {
|
|
|
|
|
|
|
+ if (enableFullReductionFlag == 0) {
|
|
|
if(shopErrandMoney.doubleValue() > 0
|
|
if(shopErrandMoney.doubleValue() > 0
|
|
|
&& order.getPayMoney().doubleValue() < exemptMinMoney.doubleValue()){
|
|
&& order.getPayMoney().doubleValue() < exemptMinMoney.doubleValue()){
|
|
|
// 跑腿费加入订单总金额
|
|
// 跑腿费加入订单总金额
|