积分商城

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

@@ -32,9 +32,11 @@ import com.freemud.sdk.api.assortment.order.request.order.ProductBindingCouponTy
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.util.*;
 
+@Component
 public class PointsMallOrderServiceImpl implements PointsMallOrderService {
 
 
@@ -63,7 +65,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
         String memberId = userLoginInfoDto.getMemberId();
         String skuId = "";
         if(CollectionUtils.isNotEmpty(createOrderVo.getProducts())){
-            createOrderVo.getProducts().get(0).getSkuId();
+            skuId = createOrderVo.getProducts().get(0).getSkuId();
         }
         //查询商品信息并且校验用户是否能购买　/product/listProductInfo　查询积分商品详情，可根据入参校验商品
         PointMallListProductInfoRequest productInfoRequest = new PointMallListProductInfoRequest();
@@ -72,7 +74,8 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
         productInfoRequest.setValidateMember(true);
         productInfoRequest.setValidateStock(true);
         productInfoRequest.setValidateTime(true);
-        PointMallListProductInfoResponse<IntegralProductType> productInfosDto = pointMallProductClient.listProductInfo(productInfoRequest);
+//        PointMallListProductInfoResponse<IntegralProductType> productInfosDto = pointMallProductClient.listProductInfo(productInfoRequest);
+        PointMallListProductInfoResponse<IntegralProductType> productInfosDto = null;
         if(!Objects.equals(100,productInfosDto.getStatusCode())){
             return ResponseUtil.error(productInfosDto.getStatusCode().toString(),productInfosDto.getMessage());
         }

order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerPropertyClient.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@FeignClient(name = "customer-property-service", url = "${saas.customerpropertyclient.feign.url}")
+@FeignClient(name = "customer-property-service", url = "http://saastestapi.sandload.cn/customer-application-service/")//${saas.customerpropertyclient.feign.url}
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface CustomerPropertyClient {
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/PointMallProductClient.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@FeignClient(value = "PRODUCTSERVICE",url="http://172.16.19.240:9996/swagger-ui.html#/")//${saas.pointMallProductClient.feign.url}
+@FeignClient(value = "PRODUCTSERVICE",url="http://172.16.19.240:9996")//${saas.pointMallProductClient.feign.url}
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface PointMallProductClient {
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponPromotionService.java

@@ -96,6 +96,10 @@ public class CouponPromotionService implements IPromotionService {
             List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResultsList = calculationDiscountResult.getCouponDiscounts();
             if (CollectionUtils.isNotEmpty(couponResultsList)) {
                 for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponResults : couponResultsList) {
+                    if(ActivityTypeEnum.TYPE_33.getCode()== couponResults.getActivityType()
+                            || ActivityTypeEnum.TYPE_32.getCode()== couponResults.getActivityType()){
+                        continue;
+                    }
                     couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());
                 }
             }