Merge branch 'master' into master-spock

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

@@ -260,6 +260,8 @@ public class CreateOrderAdapter {
             orderInfo.setOrder_token(orderPayResponse.getThirdOrderToken());
             createOrderResponseVo.setOrderInfo(orderInfo);
         }
+        // 随行付支付通道返回的endTransId无法满足一元捐插件，支付接口新增返回channelPayId字段作为商户单号使用
+        createOrderResponseVo.setOutTradeNo(orderPayResponse.getChannelPayId());
 
         return createOrderResponseVo;
     }
@@ -1506,4 +1508,4 @@ public class CreateOrderAdapter {
 
     }
 
-}
+}
\ No newline at end of file

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

@@ -87,6 +87,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.ByteOrderMark;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.FastDateFormat;
@@ -669,7 +670,7 @@ public class OrderAdapter {
             orderClients = Arrays.asList(OrderClientType.SAAS.getIndex(), OrderClientType.ALIPAY.getIndex(), OrderClientType.APP.getIndex());
             bizTypes = Arrays.asList(BizTypeEnum.ORDINARY.getBizType(), BizTypeEnum.SALE_COUPON.getBizType(), BizTypeEnum.ADVANCE_ORDER.getBizType());
             queryOrdersDto.setMarketingTypes(Arrays.asList(MarketTypeEnum.ORDER.getIndex(), MarketTypeEnum.COLLAGE.getIndex(),
-                    MarketTypeEnum.WE_CHAT_LIVE_SELL.getIndex(),MarketTypeEnum.CASHIER.getIndex()));
+                    MarketTypeEnum.WE_CHAT_LIVE_SELL.getIndex(),MarketTypeEnum.CASHIER.getIndex(),MarketTypeEnum.TIKTOK_MARKET_ORDER.getIndex()));
         }
         List<Integer> payStatus = Arrays.asList(PayStatus.HAVE_PAID.getCode(), PayStatus.HAVE_REFUND.getCode(), PayStatus.COMPLETE.getCode());
         queryOrdersDto.setPayStatus((Integer[]) payStatus.toArray());
@@ -1751,6 +1752,7 @@ public class OrderAdapter {
     /**
      * 是否支持退款
      * fisherman 虚拟券是否可退款 在这里进行操作判断 【ID1039143】  1.已完成状态,2.配置的属性值>0&&时间范围内
+     * bizType=1 && marketingType=11 小助手核销的订单不展示退款按钮 返回false
      *
      * @param orderBean 订单详情
      * @param wxAppId   wxappId
@@ -1768,7 +1770,12 @@ public class OrderAdapter {
         }
         // 爱马哥 预定单 付款之后 预定当天之前的时间都可退款
         if (orderBean.getBizType().compareTo(BizTypeEnum.ADVANCE_ORDER.getBizType()) == 0) {
-           return this.checkAdvanceOrder(orderBean.getGmtExpect());
+            return this.checkAdvanceOrder(orderBean.getGmtExpect());
+        }
+        boolean isMarketType2Tiktok =  orderBean.getBizType().compareTo(BizTypeEnum.ORDINARY.getBizType()) == 0
+                &&  orderBean.getMarketingType().compareTo(MarketTypeEnum.TIKTOK_MARKET_ORDER.getIndex().byteValue()) == 0 ;
+        if (isMarketType2Tiktok) {
+            return false;
         }
 
         // fisherman 虚拟券商品是否可退款配置校验

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -7,6 +7,7 @@ import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
 import cn.freemud.management.enums.*;
+import cn.freemud.management.enums.OperateType;
 import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.service.OrderBaseService;
 import cn.freemud.management.service.OrderManagerService;
@@ -20,12 +21,9 @@ import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo;
-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.enums.PayType;
+import com.freemud.application.sdk.api.ordercenter.enums.*;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderSourceV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
-import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExpressReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
@@ -35,6 +33,7 @@ import com.freemud.application.sdk.api.service.EmailAlertService;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.ByteOrderMark;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -271,6 +270,11 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
      */
     @Override
     public BaseResponse<OrderManagerResponse> orderCancel(OrderManagerRequest request, OrderBeanV1 orderBean){
+        if (BizTypeEnum.ORDINARY.getBizType().compareTo(orderBean.getBizType()) == 0
+                &&  MarketTypeEnum.TIKTOK_MARKET_ORDER.getIndex().compareTo(Byte.toUnsignedInt(orderBean.getMarketingType())) == 0) {
+            this.orderAgreeRefund(request, orderBean);
+            return ResponseUtil.success();
+        }
         List<Integer> newOrderStatusList = Arrays.asList(OrderStatusV1.RECEIPT.getV2Code(),OrderStatusV1.COMPLETE.getV2Code(),OrderStatusV1.COMPLETE_MAKE.getV2Code());
         List<String> sourceList = Arrays.asList(OrderSourceV1.SAAS.getCode(),OrderSourceV1.ALIPAY.getCode(),OrderSourceV1.APP.getCode());
         if (sourceList.contains(orderBean.getSource()) && newOrderStatusList.contains(orderBean.getStatusV2())) {
@@ -366,7 +370,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         //支付退款
         if (orderExtInfoDto != null  && orderExtInfoDto.getSvcAmount()!= null && StringUtils.isNotEmpty(orderExtInfoDto.getSvcCardCode())  && order.getPayStatus() > 1){
             PayRefundResponse refundResponse = paymentHandle.posOrderPayRefund(order, orderExtInfoDto);
-            if(ObjectUtils.equals(PayRefundStatus.SUCCESS,refundResponse.getPayRefundStatus())){
+            if(!ObjectUtils.equals(PayRefundStatus.SUCCESS,refundResponse.getPayRefundStatus())){
                 return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR);
             }
         }

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

@@ -13,6 +13,7 @@ public enum MarketTypeEnum {
     MEMBER_CARD(7, "付费会员卡开卡"),
     SVC(8, "储值卡充值"),
     WE_CHAT_LIVE_SELL(9, "微信视频号卖券"),
+    TIKTOK_MARKET_ORDER(11, "抖音卖券换购营销"),
     ;
 
     private Integer index;

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

@@ -693,11 +693,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 // 遍历该商品券选择的商品,并将商品券替换为普通商品
                 for (int i = cartGoodsList.size() - 1; i >= 0; i--) {
                     CartGoods cartGoods = cartGoodsList.get(i);
-                    if (GoodsTypeEnum.COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType()) || GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+
+                    if (GoodsTypeEnum.couponTypeList.contains(cartGoods.getGoodsType())) {
                         if (Objects.equals(cartGoods.getCouponCode() ,unChooseCouponCode)) {
                             CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, cartGoods.getCouponCode(), menuType,null);
                             GetProductsVo productInfo = null;
-                            if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                            if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType()) || GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType().equals(cartGoods.getGoodsType())) {
                                 productInfo = couponService.getSpqProductInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
                             } else {
                                 productInfo = couponService.getSpqProductInfo(checkSpqInfoRequestDto);