Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of…

Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

order-application-service/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.6.RELEASE</version>
+            <version>2.8.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>membercenter-sdk</artifactId>

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

+package cn.freemud.controller;
+
+import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.vo.SellCouponCreateOrderVo;
+import cn.freemud.service.impl.SellCouponOrderServiceImpl;
+import com.freemud.application.sdk.api.log.ApiAnnotation;
+import com.freemud.application.sdk.api.log.LogParams;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: CreateOrderController
+ * @Package cn.freemud.controller
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2020/5/21 17:16
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Slf4j
+@RequestMapping("/order")
+@RestController
+@Validated
+public class CreateOrderController {
+
+    @Autowired
+    private SellCouponOrderServiceImpl sellCouponOrderService;
+
+    /**
+     * 卖券订单创建
+     */
+    @ApiAnnotation(logMessage = "sellCouponOrderCreate")
+    @PostMapping("/sellCouponOrder/create")
+    public BaseResponse sellCouponOrderCreate(@Validated @LogParams @RequestBody SellCouponCreateOrderVo requestVo) {
+        return sellCouponOrderService.createOrder(requestVo);
+    }
+
+}

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

+package cn.freemud.entities.vo;
+
+import cn.freemud.entities.dto.UserDeliveryInfoDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Pattern;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: SellCouponCreateOrderVo
+ * @Package cn.freemud.entities.vo
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2020/5/21 17:27
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class SellCouponCreateOrderVo {
+
+    @NotEmpty(message = "sessionId 不能为空")
+    private String sessionId;
+
+    @NotEmpty(message = "shopId 门店号不能为空")
+    private String shopId;
+
+    //一键买券必传
+    @NotEmpty(message = "skuId 不能为空")
+    private String skuId;
+
+    /**
+     * svc 储值卡支付使用
+     */
+    private String cardCode;
+
+    @NotEmpty(message = "menuType 不能为空")
+    private String menuType;
+
+    /**
+     * form_id  用于金额是0的情况，支付宝模板消息需要传
+     */
+    private String formId;
+
+    /**
+     * 业务类型
+     */
+    @NotEmpty(message = "bizType 业务类型不能为空")
+    private String bizType;
+
+    /**
+     * 版本号
+     */
+    @NotEmpty(message = "version 版本号不能为空")
+    private String version;
+
+}

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

@@ -115,12 +115,24 @@ public class CheckOrder {
             throw new ServiceException(ResponseResult.NOT_LOGIN);
         }
         //校验会员svc卡信息
-        checkCardCode(createOrderVo.getPartnerId(),userLoginInfoDto.getMemberId(),createOrderVo.getCardCode(),trackingNo);
+        checkCardCode(createOrderVo.getPartnerId(),userLoginInfoDto.getMemberId(),createOrderVo.getCardCode());
 
         createOrderVo.setUserId(userLoginInfoDto.getMemberId());
         return userLoginInfoDto;
     }
 
+
+    public AssortmentCustomerInfoVo checkOrderByMemberNew(String sessionId, String cardCode) {
+        // 通过sessionId查询缓存中会员id
+        AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
+        if (userLoginInfoDto == null || StringUtils.isEmpty(userLoginInfoDto.getMemberId())) {
+            throw new ServiceException(ResponseResult.NOT_LOGIN);
+        }
+        //校验会员svc卡信息
+        checkCardCode(userLoginInfoDto.getPartnerId(),userLoginInfoDto.getMemberId(),cardCode);
+        return userLoginInfoDto;
+    }
+
     /**
      * 查询门店信息
      */
@@ -507,14 +519,14 @@ public class CheckOrder {
     }
 
 
-    public void checkCardCode(String partnerId,String memberId,String cardCode,String trackingNo){
+    public void checkCardCode(String partnerId,String memberId,String cardCode){
         if(StringUtils.isBlank(cardCode)){
             return;
         }
         StatisticalPropertyRequest request = new StatisticalPropertyRequest();
         request.setPartnerId(partnerId);
         request.setMemberId(memberId);
-        BaseResponse<List<GetSvcInfoByMemberIdResponse>> responseDTO = memberPropertyService.getSvcInfoByMemberId(request,trackingNo);
+        BaseResponse<List<GetSvcInfoByMemberIdResponse>> responseDTO = memberPropertyService.getSvcInfoByMemberId(request,LogThreadLocal.getTrackingNo());
         if (!ResponseResult.SUCCESS.getCode().equals(responseDTO.getCode()) || responseDTO.getData() == null
                 || responseDTO.getData().size() == 0 ) {
             throw new ServiceException(ResponseResult.USER_SVC_CARD_ERROR);

order-application-service/src/test/java/cn.freemud/service/OrderServiceTest.java

@@ -160,10 +160,10 @@ public class OrderServiceTest {
 
     }
 
-    @Test
-    public void getAccessToken() {
-        orderService.getAccessToken("1779", "wx2eba2ce69704a6c7");
-    }
+//    @Test
+//    public void getAccessToken() {
+//        orderService.getAccessToken("1779", "wx2eba2ce69704a6c7");
+//    }
 
 
     @Test