Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberOrderSimpleVo.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 
 @ApiModel(value = "AdamMemberOrderSimpleVo", description = "会员订单列表信息")
 @Data
-public class AdamMemberOrderSimpleVo implements Serializable {
+public class AdamMemberOrderSimpleVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 3978877550469933116L;
     @ApiModelProperty(position = 10, value = "订单号")
     private String orderNo;
@@ -29,4 +29,26 @@ public class AdamMemberOrderSimpleVo implements Serializable {
     private BigDecimal price;
     @ApiModelProperty(position = 17, value = "实付价格")
     private BigDecimal pricePaid;
+
+    private static final AdamMemberOrderSimpleVo obj = new AdamMemberOrderSimpleVo();
+
+    public static AdamMemberOrderSimpleVo getNew() {
+        try {
+            return (AdamMemberOrderSimpleVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdamMemberOrderSimpleVo();
+        }
+    }
+
+    public AdamMemberOrderSimpleVo copy(AdamMemberOrderVo source) {
+        if (null == source) return this;
+        this.setOrderNo(source.getOrderNo());
+        this.setState(source.getState());
+        this.setCreatedAt(source.getCreatedAt());
+        this.setMemberName(source.getMemberName());
+        this.setMode(source.getMode());
+        this.setPrice(source.getPrice());
+        this.setPricePaid(source.getPricePaid());
+        return this;
+    }
 }

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

@@ -22,12 +22,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -497,6 +499,19 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
 //        }
 //        return pagedResult;
         // TODO: 2021/7/29 会员订单列表查取
-        return ObjectUtil.getAdamMemberOrderSimpleVoPagedResult();
+        PagedResult<AdamMemberOrderSimpleVo> pagedResult = ObjectUtil.getAdamMemberOrderSimpleVoPagedResult();
+        ArrayList<AdamMemberOrderVo> orderVos = adamRdmService.getMemberOrderVosByUid(uid);
+        if (!CollectionUtils.isEmpty(orderVos)) {
+            ArrayList<AdamMemberOrderSimpleVo> vos = ObjectUtil.getAdamMemberOrderSimpleVoArrayList();
+
+            orderVos.forEach(r -> {
+                vos.add(AdamMemberOrderSimpleVo.getNew().copy(r));
+            });
+
+            pagedResult.setTotal(orderVos.size(), 20);
+            pagedResult.setList(vos);
+        }
+
+        return pagedResult;
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/util/ObjectUtil.java

@@ -4,11 +4,11 @@ import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.base.PagedResult;
 
 import java.util.ArrayList;
-import java.util.List;
 
 public class ObjectUtil {
     private static final ArrayList<AdamTagParentVo> adamTagParentVoArrayList = new ArrayList<>();
     private static final ArrayList<AdamTagVo> adamTagVoArrayList = new ArrayList<>();
+    private static final ArrayList<AdamMemberOrderSimpleVo> adamMemberOrderSimpleVoArrayList = new ArrayList<>();
 
     private static final PagedResult<AdamCollectVo> adamCollectVoPagedResult = new PagedResult<>();
     private static final PagedResult<AdamMemberOrderSimpleVo> adamMemberOrderSimpleVoPagedResult = new PagedResult<>();
@@ -23,6 +23,10 @@ public class ObjectUtil {
         return (ArrayList<AdamTagVo>) adamTagVoArrayList.clone();
     }
 
+    public static ArrayList<AdamMemberOrderSimpleVo> getAdamMemberOrderSimpleVoArrayList() {
+        return (ArrayList<AdamMemberOrderSimpleVo>) adamMemberOrderSimpleVoArrayList.clone();
+    }
+
     public static PagedResult<AdamCollectVo> getAdamCollectVoPagedResult() {
         return adamCollectVoPagedResult.clone();
     }

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

@@ -35,11 +35,9 @@ public class PerformancesExpressInfoServiceImpl {
     public KylinOrderExpressVo orderRouteDetail(String orderTicketsId) {
         LinkedList<KylinOrderExpressRouteVo> routeList = dataUtils.getOrderExpressRoute(orderTicketsId);
         KylinOrderExpressVo expressInfo = dataUtils.getOrderExpressInfos(orderTicketsId);
-        if (null == routeList) {
-            routeList = new LinkedList<>();
-        }
-        log.info("1111");
+        if (null != expressInfo) {
             expressInfo.setRouteList(routeList);
+        }
         return expressInfo;
     }
 }
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetLoginServiceImpl.java

@@ -86,6 +86,9 @@ public class SweetLoginServiceImpl {
             HashMap userInfo = new HashMap();
             userInfo.put("unionId", unionId);
             userInfo.put("openId", openId);
+            userInfo.put("getPhoneNumber", wxMaPhoneNumberInfo.getPhoneNumber());
+            userInfo.put("getPurePhoneNumber", wxMaPhoneNumberInfo.getPurePhoneNumber());
+            userInfo.put("getCountryCode", wxMaPhoneNumberInfo.getCountryCode());
 
             return ResponseDto.success(userInfo);
         } catch (Exception e) {