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

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

@@ -47,6 +47,7 @@ public class PointsMallOrderAdapter {
         productInfoRequest.setValidateMember(true);
         productInfoRequest.setValidateStock(true);
         productInfoRequest.setValidateTime(true);
+        productInfoRequest.setValidateLimitNum(true);
         return productInfoRequest;
     }
 

order-application-service/src/main/java/cn/freemud/entities/dto/product/pointsmall/PointMallListProductInfoRequest.java

@@ -42,4 +42,7 @@ public class PointMallListProductInfoRequest {
 //    @ApiModelProperty(value = "是否校验用户限制（true校验，false不校验）")
     private boolean isValidateMember;
 
+    //是否校验限购数量（true校验，false不校验）
+    private boolean validateLimitNum;
+
 }

order-application-service/src/main/java/cn/freemud/manager/OrderManager.java

+package cn.freemud.manager;
+
+import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.freemud.application.sdk.api.ordercenter.adapter.OrderCenterSdkAdapter;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
+import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
+import com.freemud.sdk.api.assortment.order.request.order.BaseQueryOrderRequest;
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OrderManager {
+
+    @Autowired
+    private OrderSdkService orderSdkService;
+
+    @Autowired
+    private OrderCenterSdkAdapter orderCenterSdkAdapter;
+
+    public QueryOrderByIdResponse queryOrderById(BaseQueryOrderRequest request){
+        QueryOrderByIdResponse queryOrderByIdResponse = new QueryOrderByIdResponse();
+        String trackingNo =  LogThreadLocal.getTrackingNo();
+        QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), request.getOrderId(),
+                request.getThirdOrderCode(), request.getWithOperationHistory(), trackingNo);
+        if(orderInfo != null){
+            queryOrderByIdResponse.setErrcode(Integer.parseInt(orderInfo.getCode()));
+            queryOrderByIdResponse.setErrmsg(orderInfo.getMessage());
+        }
+        if(orderInfo != null && orderInfo.getResult() != null){
+            OrderBeanV1 orderBeanV1 = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfo.getResult());
+            queryOrderByIdResponse.setData(orderBeanV1);
+        }
+        return queryOrderByIdResponse;
+    }
+
+}

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

@@ -54,6 +54,7 @@ import cn.freemud.management.entities.dto.response.pay.PayBatchRefundResponse;
 import cn.freemud.management.service.handle.ActivityHandle;
 import cn.freemud.management.thirdparty.MulitiPaymentClient;
 import cn.freemud.manager.BuyProductOnceManager;
+import cn.freemud.manager.OrderManager;
 import cn.freemud.manager.OrderTackCodeManager;
 import cn.freemud.manager.SpellGroupOrderDataManager;
 import cn.freemud.redis.RedisCache;
@@ -329,6 +330,9 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private BuyProductOnceManager buyProductOnceManager;
 
+    @Autowired
+    private OrderManager orderManager;
+
 
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
@@ -1401,7 +1405,7 @@ public class OrderServiceImpl implements Orderservice {
         baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         // 订单详情要查询3个月前的订单
         // 先实时查询如果没有查询es
-        QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
+        QueryOrderByIdResponse response = orderManager.queryOrderById(baseQueryOrderRequest);
 
         if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode())) {
 //            AppLogUtil.infoLog("订单详情实时查询错误，baseQueryOrderRequest，", baseQueryOrderRequest, "");

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

@@ -67,6 +67,7 @@ import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Component
 public class PointsMallOrderServiceImpl implements PointsMallOrderService {
@@ -210,7 +211,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
                 return ResponseUtil.error(createOrderResponseDto.getCode(), "支付异常," + response.getData().getResultMsg());
             }
             //唤起支付返回参数
-            pointsMallOrderAdapter.convent2CreateOrderResponseVo(createOrderResponseVo,appId,response.getData());
+            pointsMallOrderAdapter.convent2CreateOrderResponseVo(createOrderResponseVo, appId, response.getData());
         }
         //保存支付信息
         BaseResponse baseResponse1 = updateOrder(orderCode, points, cashPrice, partnerId, storeId, createOrderResponseVo.getFmId(), channel);
@@ -225,7 +226,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
         }
         //全积分支付商品，订单完成
         if (ExchangeTypeEnum.TYPE_1.getCode().equals(exchangeType)) {
-            BaseResponse response1 = orderPaySuccess(createOrderResponseDto.getResult(), points,false);
+            BaseResponse response1 = orderPaySuccess(createOrderResponseDto.getResult(), points, false);
             if (!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, response1.getCode())) {
                 return response1;
             }
@@ -299,7 +300,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
             orderItemList.add(orderItemResp);
         }
         orderInfo.setOrderItemList(orderItemList);
-        BaseResponse baseResponse = orderPaySuccess(orderInfo, 0,true);
+        BaseResponse baseResponse = orderPaySuccess(orderInfo, 0, true);
         if (!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, baseResponse.getCode())) {
             return refundFaileMessage(baseResponse.getMessage());
         }
@@ -560,7 +561,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
 
 
     //共用支付成功方法
-    private BaseResponse orderPaySuccess(OrderInfoReqs orderInfo, Integer points,Boolean isCash) {
+    private BaseResponse orderPaySuccess(OrderInfoReqs orderInfo, Integer points, Boolean isCash) {
         String nickName = orderInfo.getUserName();
         String orderCode = orderInfo.getOrderCode();
         String partnerId = orderInfo.getPartnerId();
@@ -602,12 +603,16 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
             return ResponseUtil.error(updateOrderStateResp.getCode(), "更新订单异常");
         }
         //有现金支付,扣减积分
-        if (isCash) {
-            points = orderInfo.getOrderPayItemCreateReqList().get(0).getPayAmount().intValue();
-            UseScoreRequest userScoreRequest = pointsMallOrderAdapter.convent2UseScoreRequest(partnerId, memberId, appId, orderCode, points);
-            CustomerPropertyBaseResponse baseResponse = customerPropertyClient.useScore(userScoreRequest);
-            if (!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, baseResponse.getCode())) {
-                return ResponseUtil.error(baseResponse.getCode(), "扣减积分失败");
+        if (isCash && CollectionUtils.isNotEmpty(orderInfo.getOrderPayItemCreateReqList())) {
+            List<OrderPayItemResp> collect = orderInfo.getOrderPayItemCreateReqList().stream().filter(orderPayItemResp ->
+                    orderPayItemResp.getPayChannelType().equals(PayChannelType.POINTS.getIndex().intValue())).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(collect)) {
+                points = collect.get(0).getPayAmount().intValue();
+                UseScoreRequest userScoreRequest = pointsMallOrderAdapter.convent2UseScoreRequest(partnerId, memberId, appId, orderCode, points);
+                CustomerPropertyBaseResponse baseResponse = customerPropertyClient.useScore(userScoreRequest);
+                if (!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, baseResponse.getCode())) {
+                    return ResponseUtil.error(baseResponse.getCode(), "扣减积分失败");
+                }
             }
         }
         return ResponseUtil.success();

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/adapter/OrderCenterSdkAdapter.java

@@ -184,6 +184,7 @@ public class OrderCenterSdkAdapter {
         data.setSource(OrderSourceV1.getCodeByClientType(orderInfoReqs.getOrderClient()));
         data.setSourceName(OrderSourceV1.getDescByClientType(orderInfoReqs.getOrderClient()));
         data.setStatus(OrderStatusV1.getOldCode(orderInfoReqs.getOrderState()));
+        data.setStatusV2(orderInfoReqs.getOrderState());
         data.setQueueIndex("");
         data.setUserType("");
         data.setOperateTakeOrderTime(null);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/v1/OrderBeanV1.java

@@ -186,6 +186,8 @@ public class OrderBeanV1 {
      * 订单状态  1 下单 2 待支付 3已接单 4 配送中 5 已完成 6 已取消 7 已拒单 31 制作完成
      */
     private Integer status;
+
+    private Integer statusV2;
     /**
      * 取餐地址
      */

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

@@ -587,8 +587,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
 
     private void newCalculationUpdateCouponStatus(String userId, String partnerId, String storeId, Integer bizType, CartGoods cartGoods, List<CartGoods> cartGoodsList, ActivityCalculationDiscountResponseDto.CalculationDiscountResult discountResult) {
-        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = discountResult.getDiscounts();
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = null;
+        if (null != discountResult) {
+             discounts = discountResult.getDiscounts();
+        }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> mnCouponDiscount = null;
+
         if (CollectionUtils.isNotEmpty(discounts)) {
             mnCouponDiscount = discounts.stream().filter(discount -> ActivityTypeEnum.TYPE_330.getCode().equals(discount.getType())).collect(toList());
         }

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

@@ -163,7 +163,8 @@ public class CalculationSharingDiscountService {
             coupon.setCode(checkSpqInfo.getCouponCode());
             coupon.setActivityCode(checkSpqInfo.getActiveCode());
             ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = coupons.stream().filter(p -> coupon.getActivityCode().equals(p.getActivityCode()) && coupon.getCode().equals(p.getCode())).findFirst().orElse(null);
-            accountFlag = accountFlag == null ? 0 : accountFlag;
+                // 0是非结算页，1为结算页
+                accountFlag = accountFlag == null ? 0 : accountFlag;
             if (calculationDiscountCoupon == null) {
                 if (GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType().equals(cartGoods.getGoodsType()) && accountFlag == 1 ){
                     if (cartGoods.getCanUseCoupon() == 0) {

shopping-cart-application-service/src/main/resources/application.properties

@@ -24,8 +24,4 @@ management.metrics.tags.application=${spring.application.name}
 management.endpoint.shutdown.enabled=true
 #management.security.enabled=false
 management.health.rabbit.enabled=false
-apollo.plugin.namespace=openstore.gray.rule
-
+apollo.plugin.namespace=openstore.gray.rule
\ No newline at end of file
-spring.redis.host= 212.129.146.110
-spring.redis.port=6382
-spring.redis.password=LvA6SmLAitP2kG
\ No newline at end of file