1.支付宝小程序退款接口增加回调地址修改

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PayOrderParam.java

@@ -64,4 +64,6 @@ public class PayOrderParam {
     private String productCode;
     @ApiModelProperty(value = "入场人地址vo")
     private AddressVo addressesVo;
+    @ApiModelProperty(value = "联系方式")
+    private String userMobile;
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java

@@ -36,6 +36,9 @@ public class OrderDetailsVo implements Cloneable {
     private List<KylinOrderRefundsOrderCodeVo> orderRefundsVoList;
     private List<KylinOrderCoupons> orderCouponsList;
 
+    @ApiModelProperty(value = "联系方式")
+    private String userMobile;
+
     private static final OrderDetailsVo obj = new OrderDetailsVo();
 
     public static OrderDetailsVo getNew() {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java

@@ -484,6 +484,17 @@ public class KylinRefundsStatusServiceImpl {
 
                     continue;
                 } else {
+                    //获取订单详情
+                    KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(refund.getOrderTicketsId());
+                    //退优先卷
+                    ArrayList<KylinOrderCoupons> orderCoupons = dataUtils.getOrderCoupon(refund.getOrderTicketsId());
+                    if (orderCoupons.size() > 0) {
+                        for (KylinOrderCoupons item : orderCoupons) {
+                            if (item.getCouponType() == 101) {
+                                dataUtils.backCoupon(item.getCouponCode(), orderTicketVo.getUserId());
+                            }
+                        }
+                    }
                     // 同步大麦 票务平台
                     KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(refund.getOrderTicketsId());
                     KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId());

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java

 package com.liquidnet.client.admin.zhengzai.kylin.utils;
 
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo;
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.service.candy.param.BackCouponParam;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress;
@@ -14,20 +17,25 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
+import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
 import com.liquidnet.service.slime.constant.SlimeRedisConst;
 import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
+import org.springframework.util.MultiValueMap;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
+@Slf4j
 @Component
 public class DataUtils {
 
@@ -37,6 +45,8 @@ public class DataUtils {
     private RedisDataSourceUtil redisDataSourceUtil;
     @Autowired
     private MongoVoUtils mongoVoUtils;
+    @Value("${liquidnet.service.candy.url}")
+    private String candyUrl;
 
     /**
      * 初始化普通库存
@@ -581,4 +591,33 @@ public class DataUtils {
             return (ArrayList<OrderRefundPoundage>) obj;
         }
     }
+
+    // 获取订单券的使用情况
+    public ArrayList<KylinOrderCoupons> getOrderCoupon(String orderId) {
+        String redisKey = KylinRedisConst.ORDER_COUPON.concat(orderId);
+        Object obj = redisDataSourceUtil.getRedisKylinUtil().get(redisKey);
+        if (obj == null) {
+            return getKylinOrderCouponsArrayList();
+        } else {
+            return (ArrayList<KylinOrderCoupons>) obj;
+        }
+    }
+    public void backCoupon(String uCouponId, String uid) {
+        try {
+            BackCouponParam param = BackCouponParam.getNew();
+            param.setuCouponIds(uCouponId);
+            param.setUid(uid);
+            MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
+            ArrayList<BackCouponParam> params = new ArrayList();
+            params.add(param);
+            String jsonString = JSON.toJSONString(params);
+            String returnData = HttpUtil.postRaw(candyUrl + "/candy-coupon/useBack", jsonString, header);
+        } catch (Exception e) {
+            log.error("回退券ERROR:{}", e);
+        }
+    }
+    private static final ArrayList<KylinOrderCoupons> kylinOrderCouponsArrayList = new ArrayList<>();
+    public static ArrayList<KylinOrderCoupons> getKylinOrderCouponsArrayList() {
+        return (ArrayList<KylinOrderCoupons>) kylinOrderCouponsArrayList.clone();
+    }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java

@@ -196,7 +196,7 @@ public class AdamEntersController {
         AdamEntersVo enters = adamRdmService.getEntersVoByUidEntersId(currentUid, entersId);
         if (null == enters) return ResponseDto.failure(ErrorMapping.get("10105"));
 
-//        adamEntersService.remove(currentUid, entersId);
+        adamEntersService.remove(currentUid, entersId);
 
         return ResponseDto.success();
     }

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-order/src/main/java/com/liquidnet/service/consumer/order/receiver/AbstractOrderCloseReceiver.java

@@ -350,9 +350,11 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
                 ArrayList<KylinOrderCoupons> orderCoupons = kylinOrderUtils.getOrderCoupon(kylinOrderTicketVo.getOrderTicketsId());
                 if (orderCoupons.size() > 0) {
                     for (KylinOrderCoupons item : orderCoupons) {
-                        if (item.getCouponType() != 101) {
+                        /*if (item.getCouponType() != 101) {
                             kylinOrderUtils.backCoupon(item.getCouponCode(), kylinOrderTicketVo.getUserId());
-                        }
+                        }*/
+                        //所有卷都退
+                        kylinOrderUtils.backCoupon(item.getCouponCode(), kylinOrderTicketVo.getUserId());
                     }
                 }
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -367,6 +367,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 vo.setEnterDescribe(dataUtils.getEnterInfo(performanceVo.getType(), orderTicketVo.getGetTicketType(), orderTicketVo.getIsStudent(), ticketVo.getIsTrueName()));
                 // 添加 优惠券相关
                 vo.setOrderCouponsList(dataUtils.getOrderCoupon(orderId));
+                //联系方式
+                vo.setUserMobile(orderTicketVo.getUserMobile());
             }
             log.info(UserPathDto.setData("订单详情", orderId, vo));
             return vo;

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -444,7 +444,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         orderTickets.setUserId(uid);
         Map token = CurrentUtil.getTokenClaims();
         orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")), ""));
-        orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
+        if(!StringUtil.isEmpty(payOrderParam.getUserMobile())){
+            orderTickets.setUserMobile(payOrderParam.getUserMobile());
+        }else {
+            //默认联系方式
+            orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
+        }
         orderTickets.setPerformanceTitle(performanceData.getTitle());
         orderTickets.setOrderCode(orderCode);
         orderTickets.setPayCode("");