Merge remote-tracking branch 'origin/feature/xukang_20210512_邀请有礼'

order-application-service/src/main/java/cn/freemud/entities/dto/user/OrderInfoRequest.java

+package cn.freemud.entities.dto.user;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class OrderInfoRequest {
+
+    private Integer orderClient;
+
+    private String orderCode;
+
+    private String extInfo;
+
+    private String partnerId;
+
+    private String userId;
+
+    private BigDecimal settlementAmount;
+
+    private String storeId;
+
+    private Integer bizType;
+
+}
\ No newline at end of file

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

@@ -36,6 +36,7 @@ import cn.freemud.entities.dto.product.ProductGroup;
 import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
 import cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
+import cn.freemud.entities.dto.user.OrderInfoRequest;
 import cn.freemud.entities.dto.user.SendCouponForqujiaDtoResponseDto;
 import cn.freemud.entities.dto.user.SendCouponForqujiaRequestDto;
 import cn.freemud.entities.vo.*;
@@ -76,6 +77,7 @@ import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.ProductTypeEnum;
 import com.freemud.application.sdk.api.ordercenter.request.*;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmountRequest;
@@ -122,6 +124,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
@@ -1061,6 +1064,27 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             }
         }
 
+        Header header = new Header(MQAction.INSERT.getAction(), "order-application-service-api",
+                "inviter-activity-queue-routing-key", "inviter-activity-queue");
+        OrderInfoRequest body = new OrderInfoRequest();
+        body.setBizType(orderBean.getBizType());
+        body.setExtInfo(orderBean.getExtInfo());
+        body.setOrderClient(orderAdapter.getNewOrderClient(orderBean.getSource()));
+        body.setOrderCode(orderBean.getOid());
+        body.setPartnerId(orderBean.getCompanyId());
+        body.setStoreId(orderBean.getShopId());
+        body.setUserId(orderBean.getUserId());
+        BigDecimal settlementAmount = new BigDecimal(0);
+        for(OrderSettlementResp orderSettlementResp : orderBean.getOrderSettlementDetailList()) {
+            if(orderSettlementResp.getSettlementType() != null && orderSettlementResp.getSettlementType() != 0 && "0".equals(orderSettlementResp.getProductId())) {
+                settlementAmount.add(orderSettlementResp.getSettlementAmount());
+            }
+        }
+        body.setSettlementAmount(settlementAmount);
+        MQMessage<OrderInfoRequest> mqMessage = new MQMessage<>(header, body);
+        ApiLog.info("邀请有礼发消息："+JSON.toJSONString(mqMessage));
+        mqService.convertAndSend("topic-Exchange", "inviter-activity-queue-routing-key", mqMessage);
+
         //支付回掉成功标记
         redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES);
         return sendPaySuccessNoticeMessage();

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

@@ -2071,7 +2071,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                     //如果购物车中存在月享卡，则将商品返回的卡券信息替换购物车中的卡券信息
                     replaceMonthCardInfo(valiadShopProductResult,cartGoods);
                     ProductTypeBeanDTO productType = valiadShopProductResult.getProductType();
-                    if(ObjectUtils.equals(productType.getPid(), cartGoods.getSpuId())){
+                    if(ObjectUtils.equals(valiadShopProductResult.getUuid(), cartGoods.getCartGoodsUid())){
                         //多规格商品更新套餐价格为商品返回
                         if(!Objects.equals(cartGoods.getSkuId(),cartGoods.getSpuId())) {
                             cartGoods.setFinalPrice(valiadShopProductResult.getProductType().getFinalPrice());