提交快递费不用走kylin

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

@@ -46,15 +46,14 @@ public class InnerController {
         try {
             MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
             header.add("Accept", "application/json;charset=UTF-8");
-            MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
-            params.add("uid", uid);
-            String returnData = HttpUtil.get(adamUrl + "/adam/inquire/member", params, header);
+            String returnData = HttpUtil.get(adamUrl + "/adam/rsc/inquire/member?uid=" + uid, null, header);
             ResponseDto<AdamUserMemberVo> memberVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<AdamUserMemberVo>>() {
             });
 
             AdamUserMemberVo userMemberVo = memberVo.getData();
             if (userMemberVo.getState() == 1) {
                 long second = ChronoUnit.SECONDS.between(LocalDateTime.now(), userMemberVo.getExpiryAt());
+                log.debug("过期时间="+second);
                 if (userMemberVo.isOldMember()) {
                     dataUtils.saveMember(uid, 2, second);
                 } else {

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

@@ -199,7 +199,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             }
             if (payOrderParam.getIsExpress() == 1) {
                 payOrderParam.setAdCode(addressesVo.getCountyId());
-                log.error("[快递地址异常]");
             }
 //                switch (userVo.getMembership()) {
 //                    case 10:
@@ -318,7 +317,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 isDownGeneral = true;
 
                 //学生票 判断
-                entersVoList = ObjectUtil.cloneArrayListObject();
                 if (isTrueName == 1) {
                     for (AdamEntersVo adamEnters : entersVoList) {
                         if (adamEnters == null) {
@@ -326,7 +324,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                             orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                             return ResponseDto.failure("入场人数据错误");
                         }
-                        entersVoList.add(adamEnters);
                         if (isStudent == 1) {
                             if (adamEnters.getType() != 1) {
                                 orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
@@ -1034,7 +1031,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 //加分
                 orderUtils.doTask(orderTicketData.getUserId(), orderTicketData.getPerformanceTitle(), orderTicketData.getPriceActual());
                 //
-                innerService.reportO(orderTicketData, "摩登天空");
+//                innerService.reportO(orderTicketData, "摩登天空");
                 //大麦回调
                 sycDamaiOrder(orderTickets.getOrderTicketsId(), orderTicketData.getIsMember());
             }

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

@@ -5,6 +5,7 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IPUtil;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.kylin.dao.KylinFreightChargeDao;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.*;
@@ -297,4 +298,22 @@ public class DataUtils {
             return (Integer) obj;
         }
     }
+
+    // 获取快递价格
+    public BigDecimal getExpressPrice(String adCode, String productCode){
+        BigDecimal price ;
+        Object obj = redisUtil.get(KylinRedisConst.RETURN_ADDRESS_CODE + adCode + KylinRedisConst.EXPRESS_TYPE + productCode);
+        if (obj != null) {
+            KylinFreightChargeDao k = (KylinFreightChargeDao) obj;
+            //运费为0元时返23元
+            if (k.getPrice().equals("0.00")) {
+                price = new BigDecimal("23.00");
+            }
+            price = new BigDecimal(k.getPrice());
+        } else {
+            //查询不到运费数据时返回23元
+            price = new BigDecimal("23.00");
+        }
+        return price;
+    }
 }

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

@@ -10,6 +10,8 @@ import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.candy.param.BackCouponParam;
 import com.liquidnet.service.candy.vo.CandyUseResultVo;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.kylin.dao.KylinFreightChargeDao;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.returns.InnerReturnVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
@@ -38,8 +40,6 @@ public class OrderUtils {
     private String candyUrl;
     @Value("${liquidnet.service.stone.url}")
     private String stoneUrl;
-    @Value("${liquidnet.service.kylin.url}")
-    private String kylinUrl;
 
     public String judgeOrderLimit(
             int type,
@@ -202,7 +202,7 @@ public class OrderUtils {
                 log.error("调用接口");
                 MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
                 header.add("Accept", "application/json;charset=UTF-8");
-                String returnData = HttpUtil.get(adamUrl + "/adam/rsc/inquire/enters?entersIds="+StringUtils.join(unExists, ",")+"&uid="+uid, null, header);
+                String returnData = HttpUtil.get(adamUrl + "/adam/rsc/inquire/enters?entersIds=" + StringUtils.join(unExists, ",") + "&uid=" + uid, null, header);
                 ResponseDto<List<AdamEntersVo>> res = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<List<AdamEntersVo>>>() {
                 });
                 List<AdamEntersVo> entersVoList = res.getData();
@@ -303,12 +303,7 @@ public class OrderUtils {
 
     public BigDecimal getExpressPrice(String adCode, String productCode) {
         try {
-            MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
-            header.add("Accept", "application/json;charset=UTF-8");
-            header.add("Authorization", "Bearer " + CurrentUtil.getToken());
-            String resultData = HttpUtil.get(kylinUrl + "/getShunFengPrice/getPrice?adcode=" + adCode + "&productCode=" + productCode, null, header);
-            ResponseDto<String> innerReturnVo = JsonUtils.fromJson(resultData, ResponseDto.class);
-            return new BigDecimal(innerReturnVo.getData().replace("元", ""));
+            return dataUtils.getExpressPrice(adCode, productCode);
         } catch (Exception e) {
             log.error("获取快递费失败:{}", e);
             return BigDecimal.valueOf(23);