Merge branch 'feature-20211115-视频卖券ID1039458-zxh-look'

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderResponseVo.java
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OrderSourceType.java

@@ -14,6 +14,10 @@ package com.freemud.sdk.api.assortment.order.enums;
 
 import org.apache.commons.lang.StringUtils;
 
+/**
+ * com.freemud.application.sdk.api.ordercenter.enums.OrderClientType
+ * 两个枚举类 需要同步加, 不然在订单业务代码中 会报错
+ */
 public enum OrderSourceType {
     WE_CHAT("we_chat", "自营微信小程序", 1),
     SAAS("saas", "saas 点餐", 2),
@@ -46,6 +50,7 @@ public enum OrderSourceType {
     ASSISTANT("assistant","非码小助手", 29),
     SHERPAS("sherpas","食派士", 30),
     CASHIER("cashier", "收银单", 36),
+    WE_CHAT_LIVE_SELL("we_chat_live_sell", "微信视频卖券", 37),
     parkingmanual("parkingmanual", "农工商停车手工录单", 98),
     PARKING("parking", "农工商停车", 99),
     SDG("sdg", "闪电购", 1000);
@@ -64,7 +69,8 @@ public enum OrderSourceType {
             if (e.getCode().equals(code))
                 return e;
         }
-        return null;
+        // 没查询到 默认设置 saas
+        return OrderSourceType.SAAS;
     }
 
     /**

order-application-service/pom.xml

@@ -19,6 +19,22 @@
     <dependencies>
 
         <dependency>
+            <groupId>com.freemud.thirdparty.sdk</groupId>
+            <artifactId>thirdparty-weichat-sdk</artifactId>
+            <version>1.0.0.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.freemud.application.service.sdk</groupId>
+                    <artifactId>common-log-sdk</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.freemud.application.service.sdk</groupId>
+                    <artifactId>sdk-common-base</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
             <groupId>com.xuxueli</groupId>
             <artifactId>xxl-job-core</artifactId>
             <version>2.0.1</version>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -61,6 +61,7 @@ import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPar
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.*;
 import com.freemud.application.sdk.api.ordercenter.enums.*;
+import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
 import com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
@@ -3393,6 +3394,7 @@ public class OrderAdapter {
         createOrderResponseVo.setOid(orderBean.getOid());
         createOrderResponseVo.setWxappId(orderPayResponse.getWxAppid());
         createOrderResponseVo.setFmId(orderPayResponse.getFmId());
+        createOrderResponseVo.setPayId(orderPayResponse.getPayId());
         OrderPayResponse.PayOrderBean payOrderBean = orderPayResponse.getPayOrder();
         //  腾讯有数数据上报 时间戳不能为空
         createOrderResponseVo.setTimestamp(payOrderBean == null ? Instant.now().getEpochSecond() + "" : payOrderBean.getTimestamp());

order-application-service/src/main/java/cn/freemud/constant/RedisKeyConstant.java

@@ -106,6 +106,11 @@ public class RedisKeyConstant {
     public final static String KGD_PAYMENT_CANCEL_OID = "kgd:cancel_payment_oid:";
 
     /**
+     *  获取生态 accessToken 的key前缀
+     */
+    public final static String SAAS_ACCESSTOKEN_APPID = "saas:accesstoken:appid:";
+
+    /**
      * cocoNotMadeGoods:商户号:门店号:yyyy-MM-dd
      *
      * @param partnerId

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

@@ -22,12 +22,15 @@ import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
 import cn.freemud.entities.vo.encircle.EncircleReserveBaseVo;
 import cn.freemud.entities.vo.order.CreateCashierOrderVo;
 import cn.freemud.entities.vo.order.CreateOrderInvoiceRequest;
-import cn.freemud.entities.vo.order.OrderAppealVo;
 import cn.freemud.entities.vo.order.GetInvoiceConfigRequest;
+import cn.freemud.entities.vo.order.OrderAppealVo;
 import cn.freemud.entities.vo.order.PaymentConfigVo;
 import cn.freemud.handler.OrderReportJobHandler;
+import cn.freemud.handler.WeChatLiveMsgHandle;
 import cn.freemud.monitorcenter.tools.HealthUtil;
-import cn.freemud.service.*;
+import cn.freemud.service.EncircleOrderService;
+import cn.freemud.service.Orderservice;
+import cn.freemud.service.PointsMallOrderService;
 import cn.freemud.service.impl.MallOrderServiceImpl;
 import cn.freemud.service.impl.OrderAdapterServiceImpl;
 import cn.freemud.utils.AppLogUtil;
@@ -35,6 +38,12 @@ import cn.freemud.utils.ResponseUtil;
 import cn.freemud.xxljob.OrderCountJobHandler;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
+import com.freemud.thirdparty.wechat.WeChatClient;
+import com.freemud.thirdparty.wechat.constant.WeChatConstant;
+import com.freemud.thirdparty.wechat.entities.WeChatBaseResponse;
+import com.freemud.thirdparty.wechat.entities.vo.NullFieldVo;
+import com.freemud.thirdparty.wechat.entities.vo.request.OrderDeliverySendRequestVO;
+import com.freemud.thirdparty.wechat.entities.vo.request.OrderSycnPayRequestVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -496,6 +505,7 @@ public class OrderController {
     }
 
 
+
     /**
      * 一元捐插件获取支付配置
      * @param createOrderVo

order-application-service/src/main/java/cn/freemud/entities/live/WeChatReportVO.java

+package cn.freemud.entities.live;
+
+import com.freemud.thirdparty.wechat.entities.vo.request.OrderCreateRequestVO;
+import com.freemud.thirdparty.wechat.entities.vo.response.OrderCreateResponseVO;
+import lombok.Data;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2021/11/16 下午4:32
+ * @description :
+ */
+@Data
+public class WeChatReportVO {
+    private OrderCreateRequestVO requestVO;
+    private OrderCreateResponseVO data;
+
+    public WeChatReportVO(OrderCreateRequestVO requestVO, OrderCreateResponseVO data) {
+        this.requestVO = requestVO;
+        this.data = data;
+    }
+
+    private WeChatReportVO() {
+    }
+}

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

 package cn.freemud.entities.vo;
 
-import cn.freemud.entities.dto.CreateOrderProductDto;
-import cn.freemud.entities.dto.UserDeliveryInfoDto;
-import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
-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.NotNull;
-import javax.validation.constraints.Pattern;
 import java.util.List;
 
 /**
@@ -84,5 +78,9 @@ public class AppCreateOrderVo {
     private Integer bizType;
 
 
+    /**
+     * 卖券场景值
+     */
+    private String scene ;
 
 }

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

@@ -13,7 +13,7 @@
 package cn.freemud.entities.vo;
 
 import cn.freemud.entities.ttpay.OrderInfo;
-import cn.freemud.entities.vo.order.PlugInParameter;
+import com.freemud.thirdparty.wechat.entities.vo.request.OrderCreateRequestVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -72,4 +72,14 @@ public class CreateOrderResponseVo {
     //一元捐插件新增
     private String outTradeNo;
 
+    /**
+     * pay_id : 微信小程序支付
+     */
+    private String payId;
+
+
+    /**
+     *  微信视频直播卖券,需要的反馈对象
+     */
+    private OrderCreateRequestVO wxOrderInfo;
 }

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
  *
@@ -67,9 +61,17 @@ public class SellCouponCreateOrderVo {
 
     /**
      * 【华莱士】【订单C端记录不分账的卡面编号】不让走分账，卡面编号--11840，11845，11846，11853，11854，11855，11857，11858，11859，11860，11861，11862，11863，11864，11865，11866，11906
-     *
-     *  1 表示不分账 ,其他情况 不传值 给基础服务
+     * <p>
+     * 1 表示不分账 ,其他情况 不传值 给基础服务
      */
     private Integer unDistribution;
 
+
+    /**
+     * 视频卖券 需要带上该参数
+     * 卖券场景值
+     */
+    private String scene;
+
+
 }

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

@@ -198,7 +198,7 @@ public class AppOrderServiceImpl implements AppOrderService {
             String skuId = createOrderReq.getOrderProducts().get(0).getSkuId();
             //20200107提取虚拟商品券效验方法---》校验虚拟商品，如果正常则返回创建订单对象
             BaseResponse createOrderRequestResponse =
-                    sellCouponOrderService.checkOrderCoupon(customerInfo, storeResponse, trackingNo, createOrderReq.getMenuType(), Integer.valueOf(createOrderReq.getBizType()), partnerId, shopId, skuId, null);
+                    sellCouponOrderService.checkOrderCoupon(customerInfo, storeResponse, trackingNo, createOrderReq.getMenuType(), Integer.valueOf(createOrderReq.getBizType()), partnerId, shopId, skuId, null,createOrderReq.getScene());
             if (createOrderRequestResponse == null || !ResponseResult.SUCCESS.getCode().equals(createOrderRequestResponse.getCode()) || createOrderRequestResponse.getResult() == null) {
                 return createOrderRequestResponse;
             }

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

@@ -43,6 +43,7 @@ import cn.freemud.entities.vo.order.OrderAppealVo;
 import cn.freemud.entities.vo.order.QueryOrderAppealResponseVo;
 import cn.freemud.enums.OrderType;
 import cn.freemud.enums.*;
+import cn.freemud.handler.WeChatLiveMsgHandle;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request;
 import cn.freemud.management.entities.dto.response.activity.GroupWorkRefundResponse;
@@ -261,6 +262,8 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private MicroOpenplatformClient microOpenplatformClient;
 
+    @Autowired
+    private WeChatLiveMsgHandle weChatLiveMsgHandle;
 
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
@@ -1834,6 +1837,8 @@ public class OrderServiceImpl implements Orderservice {
         }
         // TODO: 2019/9/10 删除订单通知
         orderQueueService.backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
+
+        weChatLiveMsgHandle.reportOrderStatus(orderBean,3);
         return ResponseUtil.success();
     }
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/CreateOrderSceneEnum.java

+package com.freemud.application.sdk.api.ordercenter.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2021/11/16 下午2:08
+ * @description :  视频直播 场景值记录
+ */
+@AllArgsConstructor
+@Getter
+public enum CreateOrderSceneEnum {
+
+    LIVE_STORE_ENTER("1175", "视频号主页商店入口"),
+    LIVE_PRODUCT("1177", "视频号直播商品"),
+    LIVE_HOME_PAGE_PRODUCT("1195", "视频号主页商品tab");
+
+    private String scene;
+
+    private String name;
+
+    /**
+     * 卖券订单需要校验的场景值
+     */
+    public static List<String> verifySceneOrder = Arrays.asList(CreateOrderSceneEnum.LIVE_STORE_ENTER.getScene(),
+            CreateOrderSceneEnum.LIVE_PRODUCT.getScene(),
+            CreateOrderSceneEnum.LIVE_HOME_PAGE_PRODUCT.getScene()
+    );
+
+
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderClientType.java

@@ -11,6 +11,10 @@ package com.freemud.application.sdk.api.ordercenter.enums;
  * @date: 2019/4/2 13:44
  * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ * <p>
+ * <p>
+ * * com.freemud.application.sdk.api.ordercenter.enums.OrderClientType
+ * * 两个枚举类 需要同步加, 不然在订单业务代码中 会报错
  */
 public enum OrderClientType {
 
@@ -18,7 +22,7 @@ public enum OrderClientType {
     SAAS(2, "i点餐"),
     ALIPAY(3, "自营支付宝小程序"),
     HTML5(4, "自营H5"),
-    ANDROID( 5, "自营安卓APP"),
+    ANDROID(5, "自营安卓APP"),
     IOS(6, "自营苹果APP"),
     PC_WEB(7, "自营PC-WEB"),
     ELEME(8, "饿了么"),
@@ -27,9 +31,9 @@ public enum OrderClientType {
     MEITUAN(11, "美团外卖"),
     APP(12, "自营APP"),
     I_MEMBER(13, "i应用会员"),
-    I_CARGO(14 , "i应用订货"),
-    POS(15 , "POS"),
-    WAI_MEAL(19,"i围餐"),
+    I_CARGO(14, "i应用订货"),
+    POS(15, "POS"),
+    WAI_MEAL(19, "i围餐"),
     JUBAOPEN(20, "美团服务商"),
     DIANPING(21, "美团点评"),
     KOUBEI(22, "口碑"),
@@ -39,9 +43,10 @@ public enum OrderClientType {
     TIKTOKPAY(27, "抖音小程序"),
     BEAUTIFUL(28, "美业"),
     ASSISTANT(29, "非码小助手"),
-    SHERPAS(30,"食派士"),
-    PARKING(99 , "农工商停车"),
+    SHERPAS(30, "食派士"),
+    PARKING(99, "农工商停车"),
     CASHIER(36, "收银买单"),
+    WE_CHAT_LIVE_SELL(37, "微信视频卖券"),
     ;
 
 
@@ -69,9 +74,9 @@ public enum OrderClientType {
         this.name = name;
     }
 
-    public static OrderClientType getOrderClientType(Integer index){
-        for (OrderClientType orderType : values()){
-            if (index.equals(orderType.getIndex())){
+    public static OrderClientType getOrderClientType(Integer index) {
+        for (OrderClientType orderType : values()) {
+            if (index.equals(orderType.getIndex())) {
                 return orderType;
             }
         }