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

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

@@ -406,4 +406,15 @@ public class OrderController {
         return orderservice.timeOutOrderRefund(timeOutOrderVo);
     }
 
+    /**
+     * 用户开放平台,订单支付完成回调
+     * @param requestVo
+     * @return
+     */
+    @ApiAnnotation(logMessage = "platform/paysuccess")
+    @PostMapping("/platform/paysuccess")
+    public BaseResponse platformPaysuccess(@Validated @LogParams @RequestBody PlatformPaySuccessRequest requestVo){
+        return orderservice.platformPaysuccess(requestVo);
+    }
+
 }

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

@@ -146,4 +146,8 @@ public interface Orderservice {
     BaseResponse queryOrderRider(OrderRiderRequestVo requestVo);
 
     BaseResponse timeOutOrderRefund(TimeOutOrderVo timeOutOrderVo);
+
+    BaseResponse platformPaysuccess(PlatformPaySuccessRequest requestVo);
+
 }
+

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

@@ -1281,6 +1281,25 @@ 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)) {
             try {

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -191,5 +191,10 @@ public class OrderExtInfoDto {
      */
     private String stationId;
 
+    /**
+     * 线下订单储值卡支付金额
+     */
+    private Integer svcAmount;
+
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java

@@ -13,12 +13,11 @@
 package cn.freemud.controller;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.dto.GetMemberInfoRequestDto;
 import cn.freemud.entities.vo.*;
-import cn.freemud.enums.CreateOrderType;
 import cn.freemud.enums.OrderChannelType;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.service.ShoppingCartNewService;
-import cn.freemud.service.ShoppingCartToolsService;
 import cn.freemud.service.impl.ShoppingCartMallServiceImpl;
 import cn.freemud.service.impl.ShoppingCartMealServiceImpl;
 import cn.freemud.service.impl.ShoppingCartNewServiceImpl;
@@ -28,7 +27,6 @@ import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
-import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import io.swagger.annotations.Api;
@@ -177,4 +175,14 @@ public class ShoppingCartController {
         return SDKCommonBaseContextWare.getBean(ShoppingCartToolsServiceImpl.class).clear(request);
     }
 
+
+    /**
+     * 线下订单查询接口
+     */
+    @ApiAnnotation(logMessage = "/getMemberInfo")
+    @PostMapping(value = "/getMemberInfo")
+    public BaseResponse getMemberInfo(@LogParams @RequestBody GetMemberInfoRequestDto request) {
+        return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).getMemberInfo(request);
+    }
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/GetMemberInfoRequestDto.java

+package cn.freemud.entities.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GetMemberInfoRequestDto {
+
+    private String partnerId;
+
+    private String mobile;
+
+    private String userId;
+
+
+    /**
+     * 实际支付金额（分）
+     */
+    private Integer actualPayAmount;
+
+    /**
+     * 下单门店号
+     */
+    private String storeId;
+
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
+     * 订单原金额（分）
+     */
+    private Integer originalAmount;
+
+    /**
+     * 下单渠道
+     */
+    private Integer orderClient;
+
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+
+    /**
+     * 支付渠道
+     */
+    private String payChannel;
+
+    /**
+     * 支付渠道名称
+     */
+    private String payChannelName;
+
+    /**
+     * pos编号
+     */
+    private String posCode;
+    /**
+     * 操作人
+     */
+    private String operator;
+    /**
+     * 是否赠送积分 0是1否
+     */
+    private Integer needBonus;
+
+    /**
+     * 订单商品信息
+     */
+    private List<OrderItemRequest> orderItemList;
+
+    @Data
+    public static class OrderItemRequest {
+
+        /**
+         * 商品序号
+         */
+        private Integer productSeq;
+
+        /**
+         * 平台商品编号
+         */
+        private String productId;
+
+        /**
+         * 商家商品编号
+         */
+        private String thirdProductId;
+
+        /**
+         * 商品名称
+         */
+        private String productName;
+
+        /**
+         * 商品单价（分）
+         */
+        private Integer productPrice;
+
+        /**
+         * 数量
+         */
+        private Integer productQuantity;
+
+        /**
+         * 优惠分摊金额（分）
+         */
+        private Integer productSharePrice;
+
+        /**
+         * 商品单位
+         */
+        private String productWeightUnit;
+
+        /**
+         * 商品重量（克）
+         */
+        private Integer weight;
+
+        /**
+         * 商品规格名称（大杯）
+         */
+        private String productSpecName;
+
+        /**
+         * 商品属性名称（三分糖）
+         */
+        private String productProperty;
+
+        /**
+         * 商家商品分类编号
+         */
+        private String thirdCateCode;
+
+        /**
+         * 是否算积分
+         */
+        private String needBonus;
+
+
+    }
+
+
+}

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/GetMemberInfoResponseVo.java

+package cn.freemud.entities.dto;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GetMemberInfoResponseVo {
+
+    private String userId;
+
+    private Score score;
+
+    private List<Coupon> coupons;
+
+    private List<Card> cards;
+
+    @Data
+    public static class Score {
+
+        /**
+         * 当前可用积分
+         */
+        private Integer currentScore;
+        /**
+         * 积分抵扣金额，单位分
+         */
+        private Integer reduceAmount;
+
+        /**
+         * 抵扣积分
+         */
+        private Integer reduceScore;
+
+    }
+
+    @Data
+    public static class Coupon {
+
+        /**
+         * 券名称
+         */
+        private String couponName;
+
+        /**
+         * 券CODE
+         */
+        private String couponCode;
+
+        /**
+         * 券类型 0：商品 券 1：代金券 3 折扣券
+         */
+        private Integer cuoponType;
+
+        /**
+         * 如：2019-10-1 至 2019-10-10 当天有效
+         */
+        private String couponLimit;
+
+        /**
+         * 优惠金额,单位分
+         */
+        private Integer discountAmount;
+
+        /**
+         * 状态：-1:未激活 0:可用(剔除过期) 1:已使用 2:部分使用 3:取消 6:已过期(根据生失效日期) 99：未知（目前暂不支持）
+         */
+        private Integer status;
+
+        private List<Product> products;
+
+    }
+
+    @Data
+    public static class Product {
+
+        /**
+         * 商户商品编号
+         */
+        private String pid;
+
+        /**
+         * 商品名称
+         */
+        private String name;
+
+        /**
+         * 最大可取商品个数
+         */
+        private Integer number;
+
+        /**
+         * 商品折扣价，以分为单位
+         */
+        private Integer priceAct;
+
+        /**
+         * 原价，以分为单位
+         */
+        private Integer priceOriginal;
+
+        /**
+         * 支付信息
+         */
+        Payment payment;
+
+    }
+
+    @Data
+    public static class Payment {
+
+        /**
+         * 线上已付金额，以分为单位
+         */
+        private Integer paid;
+
+        /**
+         * 线下需要收取的金额，以分为单位
+         */
+        private Integer remaining;
+
+    }
+
+    @Data
+    public static class Card {
+
+        /**
+         * 实充余额，单位分
+         */
+        private Integer amount;
+
+        /**
+         * 赠送余额，单位分
+         */
+        private Integer vamount;
+
+        /**
+         * 卡规格ID
+         */
+        private String applyId;
+
+        /**
+         * 卡号
+         */
+        private String cardCode;
+
+        /**
+         * 卡名称
+         */
+        private String cardName;
+
+    }
+}

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

@@ -18,9 +18,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -101,6 +99,10 @@ public interface ShoppingCartNewService {
 
     List<CartGoods> updateCartGoodsLegal(CartGoods cartGoods, String userId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, List<CartGoods> oldAllCartGoodsList);
 
+    default BaseResponse<GetMemberInfoResponseVo> getMemberInfo(GetMemberInfoRequestDto request){
+        return null;
+    };
+
     /**
      * 商品券校验券是否有效
      *