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

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

@@ -395,4 +395,15 @@ public class OrderController {
         return orderservice.queryOrderRider(requestVo);
     }
 
+    /**
+     * 用户开放平台,订单支付完成回调
+     * @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

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

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

@@ -1240,6 +1240,25 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success(responseVo);
     }
 
+    @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 {