Merge branch 'feature/2.0.12-富友线下对接开放平台-lcf' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -410,4 +410,5 @@ public class OrderController {
 
 
 
+
 }

order-application-service/src/main/java/cn/freemud/entities/vo/PlatformPaySuccessRequest.java

-package cn.freemud.entities.vo;
-
-import lombok.Data;
-import org.hibernate.validator.constraints.NotEmpty;
-
-@Data
-public class PlatformPaySuccessRequest {
-
-    @NotEmpty(message = "orderCode 不能为空")
-    private String orderCode;
-
-    @NotEmpty(message = "商户号 不能为空")
-    private String partnerId;
-
-}

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -151,4 +151,3 @@ public interface Orderservice {
     BaseResponse platformPaysuccess(PlatformPaySuccessRequest requestVo);
 
 }
-

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

@@ -1280,24 +1280,6 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success();
     }
 
-    @Override
-    public BaseResponse platformPaysuccess(PlatformPaySuccessRequest requestVo) {
-
-        BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
-        baseQueryOrderRequest.setOrderId(requestVo.getOrderCode());
-        baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
-        QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
-
-        if (!RESPONSE_SUCCESS_CODE.equals(queryOrderByIdResponse.getErrcode()) || queryOrderByIdResponse.getData() == null) {
-            return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
-        }
-        // 扣减储值卡
-        // 扣减券
-        // 扣减积分
-
-
-        return ResponseUtil.success();
-    }
 
     private String getRedpacketsPicture(String activityId) {
         if (StringUtils.isNotBlank(activityId)) {

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

@@ -1075,7 +1075,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
     private CartGoods convert2ShopCartGoods(GetMemberInfoRequestDto.OrderItemRequest each){
         CartGoods card = new CartGoods();
-        int saleValue = (each.getProductPrice() * each.getProductQuantity() - each.getProductSharePrice()) / each.getProductQuantity();
+        int sharePrice = each.getProductSharePrice() == null ? 0 : each.getProductSharePrice();
+        int saleValue = (each.getProductPrice() * each.getProductQuantity() - sharePrice) / each.getProductQuantity();
         card.setAmount(Long.valueOf(saleValue));
         card.setOriginalPrice(each.getProductPrice() == null ? 0L : Long.valueOf(each.getProductPrice()));
         card.setQty(each.getProductQuantity());