1、增加自助录单接口

order-application-service/pom.xml

@@ -12,6 +12,7 @@
     <properties>
         <jacoco.version>0.7.5.201505241946</jacoco.version>
         <junit.version>4.12</junit.version>
+        <ordercenter-sdk.version>1.4.31-SNAPSHOT</ordercenter-sdk.version>
     </properties>
 
     <artifactId>order-application-service</artifactId>
@@ -41,7 +42,20 @@
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
             <version>1.5.17-RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>ordercenter-sdk</artifactId>
+                    <groupId>cn.freemud</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>cn.freemud</groupId>
+            <artifactId>ordercenter-sdk</artifactId>
+            <version>${ordercenter-sdk.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>

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

@@ -239,4 +239,12 @@ public class OrderController {
         return orderAdapterService.createPrepay(request);
     }
 
+    @ApiOperation(value = "创建积分订单", notes = "创建积分订单", produces = "application/json")
+    @ApiAnnotation(logMessage = "createIntegralOrder")
+    @PostMapping("/createIntegralOrder")
+    public BaseResponse createIntegralOrder(@Validated @LogParams @RequestBody IntegralOrderVo request) {
+        return orderservice.createIntegralOrder(request);
+    }
+
+
 }

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

+package cn.freemud.entities.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.com
+ *
+ * @version V1.0
+ * @Description: 积分订单
+ * @author: hongwang.zhang
+ * @date: 2020-01-07 19:43:40
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目.
+ */
+@Setter
+@Getter
+@ToString
+public class IntegralOrderVo {
+
+    @NotEmpty(message = "图片url,不能为空")
+    @ApiModelProperty(value = "图片url")
+    private List<String> imgUrl;
+
+    @NotBlank(message = "商户id 不能为空")
+    @ApiModelProperty(value = "商户号")
+    private String partnerId;
+
+    @NotNull(message = "业务类型不能为空")
+    @ApiModelProperty(value = "默认不填=99,订单业务类型 1:普通订单 2:虚拟订单 3:会员订单 4:积分商城订单 5:储值卡订单 6:卖券订单,97:自助录单 98:农工商停车手工录单 99:农工商停车订单")
+    private Byte bizType;
+
+    /**
+     * 用户sessionId
+     */
+    @NotEmpty(message = "用户sessionId 不能为空")
+    @ApiModelProperty(value = "用户sessionId")
+    private String sessionId;
+
+
+}

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

@@ -103,4 +103,11 @@ public interface Orderservice {
     BaseResponse getRefundReason(GetRefundReasonVo getRefundReasonVo);
 
     BaseResponse getNewRefundReason(GetRefundReasonVo getRefundReasonVo);
+
+    /**
+     * 创建积分订单
+     * @param vo
+     * @return
+     */
+    BaseResponse createIntegralOrder(IntegralOrderVo vo);
 }

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

@@ -79,6 +79,9 @@ 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.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
+import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq;
+import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp;
+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;
 import com.freemud.application.sdk.api.paymentcenter.client.response.CodePayResponse;
@@ -224,6 +227,8 @@ public class OrderServiceImpl implements Orderservice {
     private OrderAdapterService orderAdapterService;
     @Autowired
     private AssortmentOpenPlatformPartnerManager assortmentOpenPlatformPartnerManager;
+    @Autowired
+    private OrderSdkService orderSdkService;
 
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
@@ -1334,6 +1339,29 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success(result);
     }
 
+    @Override
+    public BaseResponse createIntegralOrder(IntegralOrderVo vo) {
+        AssortmentCustomerInfoVo userInfo = customerInfoManager.getCustomerInfoByObject(vo.getSessionId());
+        if (userInfo == null || StringUtils.isEmpty(userInfo.getMemberId())) {
+            return ResponseUtil.error(ResponseResult.NOT_LOGIN);
+        }
+        ParkingOrderCreateReq req = new ParkingOrderCreateReq();
+        req.setBizType(vo.getBizType());
+        req.setUserId(userInfo.getMemberId());
+        req.setUserName(userInfo.getNickName());
+        req.setPartnerId(vo.getPartnerId());
+        req.setImgUlr(vo.getImgUrl());
+        req.setMobile(userInfo.getMobile());
+        com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderResp> result = orderSdkService.parking_v2_create(req, LogThreadLocal.getTrackingNo());
+        if (Objects.isNull(result)) {
+            return new BaseResponse(ResponseResultEnum.SYSTEM_ERROR.getCode(), ResponseResultEnum.SYSTEM_ERROR.getMessage(), "", null);
+        }
+        if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || Objects.isNull(result.getResult())) {
+            return new BaseResponse(result.getCode(), result.getMessage(), "", null);
+        }
+        return ResponseUtil.success();
+    }
+
     private String buildRefundDocument(String oid) {
         QueryOrderByIdResponseDto response = getQueryOrderByIdResponseDto(oid);
         if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode()) || response.getData() == null) {

order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@FeignClient(name = "ACTIVITY-APPLICATION-SERVICE", url = "${saas.activityapplicationclient.feign.url}")
+@FeignClient(name = "ACTIVITY-APPLICATION-SERVICE")
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface ActivityApplicationClient {