Merge branch 'bugfix/20201118_xukang_下单加锁防止重复下单'

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

@@ -185,7 +185,7 @@ public class DeliveryAdapter {
         if (CollectionUtils.isNotEmpty(order.getProductList())) {
             order.getProductList().forEach(productList -> {
                 ProductInfo deliveryProductInfo = new ProductInfo();
-                deliveryProductInfo.setProductCode(productList.getProductId());
+                deliveryProductInfo.setProductCode(productList.getProductId().substring(4));
                 String productName = StringUtils.isBlank(productList.getSpecificationName()) ? productList.getProductName() : productList.getSpecificationName();
                 OrderProductAddInfoDto extInfo = JSON.parseObject(productList.getExtInfo(), OrderProductAddInfoDto.class);
                 if(CollectionUtils.isNotEmpty(extInfo.getSpecialAttrs())) {
@@ -221,7 +221,7 @@ public class DeliveryAdapter {
                 if(CollectionUtils.isNotEmpty(productList.getComboProduct())) {
                     productList.getComboProduct().forEach(comboProduct -> {
                         ProductInfo deliveryComboProductInfo = new ProductInfo();
-                        deliveryComboProductInfo.setProductCode(comboProduct.getProductId());
+                        deliveryComboProductInfo.setProductCode(comboProduct.getProductId().substring(4));
                         String productNameCombo = StringUtils.isBlank(comboProduct.getSpecificationName()) ? comboProduct.getProductName() : comboProduct.getSpecificationName();
                         OrderProductAddInfoDto extInfoCombo = JSON.parseObject(comboProduct.getExtInfo(), OrderProductAddInfoDto.class);
                         if(CollectionUtils.isNotEmpty(extInfoCombo.getSpecialAttrs())) {
@@ -251,7 +251,7 @@ 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().replace("_", "")));
+                        deliveryComboProductInfo.setParentCode(Long.valueOf(comboProduct.getParentProductId().replace("_", "").substring(4)));
                         deliveryProductInfo.setProductCode(deliveryComboProductInfo.getParentCode()+"");
 
                         if(CollectionUtils.isNotEmpty(comboProduct.getMaterialProduct())) {

order-application-service/src/main/java/cn/freemud/service/impl/CheckMCCafeOrder.java

@@ -557,12 +557,21 @@ public class CheckMCCafeOrder {
             throw new ServiceException(ResponseResult.SHOPPING_CART_GETINFO_INVAILD);
         }
         List<MCCafeCouponVo> mcCafeCouponVos = new ArrayList<>();
+        Map<String, String> mcCafeUsedCoupon = new HashMap<>();
         if(CollectionUtils.isNotEmpty(shoppingCartGoodsDto.getActivityDiscountsDtos())) {
             shoppingCartGoodsDto.getActivityDiscountsDtos().forEach(o-> {
                 if(ActivityTypeEnum.TYPE_3.getCode().equals(o.getActivityType()) || ActivityTypeEnum.TYPE_32.getCode().equals(o.getActivityType())
                         || ActivityTypeEnum.TYPE_34.getCode().equals(o.getActivityType()) || ActivityTypeEnum.TYPE_35.getCode().equals(o.getActivityType())) {
                     mcCafeCouponVos.add(new MCCafeCouponVo(o.getActivityCode()));
                 }
+                if(ActivityTypeEnum.TYPE_32.getCode().equals(o.getActivityType()) && null != o.getExtendType()
+                        && (0 == o.getExtendType() || 3 == o.getExtendType() || 4 == o.getExtendType() || 5 == o.getExtendType())) {
+                    if(StringUtils.isNotBlank(mcCafeUsedCoupon.get(o.getActivityCode()))) {
+                        throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, o.getActivityName() + "不可以重复使用");
+                    } else {
+                        mcCafeUsedCoupon.put(o.getActivityCode(), o.getActivityName());
+                    }
+                }
             });
         }
         if(CollectionUtils.isNotEmpty(mcCafeCouponVos)) {

order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

@@ -178,19 +178,18 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
 
         // 添加分布式锁，如果没有取得锁直接返回失败；整个方法执行完毕后会删掉该锁
         // 锁定秒数从apollo获取，如果apollo没有设置，默认5秒
-//        String createOrderKey = CREATE_ORDER_KEY + assortmentCustomerInfoVo.getMemberId();
-//        try {
-//            Long expire = Long.valueOf(createOrderKeyExpire);
-//            if(!LockUtils.lock(redisCache.getRedisTemplate(),createOrderKey,expire)){
-//                return ResponseUtil.error(ResponseResult.ORDER_NOT_CREATE_ERROR);
-//            }
-//            return mcCafeOrderService.createMCCafeOrder(createOrderVo);
-//        } catch (Exception e) {
-//            throw e;
-//        } finally {
-//            //LockUtils.unlock(redisCache.getRedisTemplate(),createOrderKey);
-//        }
-        return mcCafeOrderService.createMCCafeOrder(createOrderVo);
+        String createOrderKey = CREATE_ORDER_KEY + assortmentCustomerInfoVo.getMemberId();
+        try {
+            Long expire = Long.valueOf(createOrderKeyExpire);
+            if(!LockUtils.lock(redisCache.getRedisTemplate(),createOrderKey,expire)){
+                return ResponseUtil.error(ResponseResult.ORDER_NOT_CREATE_ERROR);
+            }
+            return mcCafeOrderService.createMCCafeOrder(createOrderVo);
+        } catch (Exception e) {
+            throw e;
+        } finally {
+            //LockUtils.unlock(redisCache.getRedisTemplate(),createOrderKey);
+        }
     }
 
     @Override