开放平台订单列表和订单详情

lb-app/src/main/java/com/ydd/app/controller/MemberApi.java

@@ -191,4 +191,13 @@ public class MemberApi extends BaseController {
         return BaseResult.success(pageResult);
     }
 
+    @GetMapping(value = "/rechargeList")
+    @AccessToken
+    @ControllerLog("充值流水")
+    public BaseResult<PageResult> rechargeList(@RequestParam("startTime") String startTime,
+                                               @RequestParam("endTime") String endTime) {
+        Long memberId =getLoginId();
+        startPage();
+        return BaseResult.success(new PageResult(apiMemberService.rechargeList(startTime, endTime, memberId)));
+    }
 }

lb-app/src/main/java/com/ydd/app/service/ApiMemberService.java

@@ -7,12 +7,10 @@ import com.ydd.app.dto.WechatInfo;
 import com.ydd.app.vo.LoginVo;
 import com.ydd.common.core.page.PageResult;
 import com.ydd.ecloud.core.exception.RRException;
-import com.ydd.module.domain.AppShare;
-import com.ydd.module.domain.Member;
-import com.ydd.module.domain.MemberBalanceLog;
-import com.ydd.module.domain.MemberToken;
+import com.ydd.module.domain.*;
 import com.ydd.module.dto.InvitationDto;
 import com.ydd.module.dto.MemberDetailDto;
+import com.ydd.module.dto.RechargeDto;
 import com.ydd.module.request.AccountFlowListRequest;
 
 import java.math.BigDecimal;
@@ -226,4 +224,6 @@ public interface ApiMemberService {
      * @param loginId 登录用户id
      */
     void addAliasId(Long loginId);
+
+    List<Recharge> rechargeList(String startTime, String endTime, Long memberId);
 }

lb-app/src/main/java/com/ydd/app/service/ApiOrderDetailService.java

@@ -25,7 +25,7 @@ public interface ApiOrderDetailService {
 
 
 
-    List<Order> findList(List<Long> memberIds, Integer status, String searchKey, Integer shopId, String startDate, String endDate,
+    List<OrderDto> findList(List<Long> memberIds, Integer status, String searchKey, Integer shopId, String startDate, String endDate,
                          String city, Integer deliveryId, Integer type);
 
     OrderDto findDetail(Long loginId, Integer orderId,String version);

lb-app/src/main/java/com/ydd/app/service/impl/ApiMemberServiceImpl.java

@@ -33,6 +33,7 @@ import com.ydd.module.domain.*;
 import com.ydd.module.dto.InvitationDto;
 import com.ydd.module.dto.MemberBalanceLogDto;
 import com.ydd.module.dto.MemberDetailDto;
+import com.ydd.module.dto.RechargeDto;
 import com.ydd.module.enums.*;
 import com.ydd.module.expection.CustomAppException;
 import com.ydd.module.push.MessagePushService;
@@ -119,6 +120,7 @@ public class ApiMemberServiceImpl implements ApiMemberService {
     private final IPersonnelService iPersonnelService;
 
     private final ISysConfigService iSysConfigService;
+    private final IRechargeService iRechargeService;
 
 
     /**
@@ -908,8 +910,10 @@ public class ApiMemberServiceImpl implements ApiMemberService {
         list.forEach(memberBalanceLog -> {
             Member shopMember = iMemberService.getById(memberBalanceLog.getMemberId());
             if (shopMember != null) {
-               String shopName = iShopService.getShopNameById(shopMember.getShopId());
-                memberBalanceLog.setShopName(shopName);
+               //String shopName = iShopService.getShopNameById(shopMember.getShopId());
+                Shop shop = iShopService.getById(shopMember.getShopId());
+                memberBalanceLog.setShopName(shop.getName());
+                memberBalanceLog.setCityName(shop.getCityName());
             }
             if (memberBalanceLog.getOrderSn() != null && memberBalanceLog.getWaimaiOrderId() == null) {
                 memberBalanceLog.setOrderType(99);
@@ -1012,4 +1016,13 @@ public class ApiMemberServiceImpl implements ApiMemberService {
             }
         }
     }
+
+    @Override
+    public List<Recharge> rechargeList(String startTime, String endTime,Long memberId) {
+        Recharge recharge = new Recharge();
+        recharge.setMemberId(memberId);
+        recharge.setStartTime(startTime);
+        recharge.setEndTime(endTime);
+        return iRechargeService.queryList(recharge);
+    }
 }

lb-app/src/main/java/com/ydd/app/service/impl/ApiOrderDetailServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -63,40 +64,45 @@ public class ApiOrderDetailServiceImpl implements ApiOrderDetailService {
     private final IWaimaiFoodImgService iWaimaiFoodImgService;
 
     @Override
-    public List<Order> findList(List<Long> memberIds, Integer status, String searchKey, Integer shopId,String startDate,String endDate, String city, Integer deliveryId, Integer type) {
+    public List<OrderDto> findList(List<Long> memberIds, Integer status, String searchKey, Integer shopId,String startDate,String endDate, String city, Integer deliveryId, Integer type) {
         List<Order> list = iOrderService.findList(memberIds, status, searchKey,shopId,startDate,endDate,city,deliveryId,type);
+        List<OrderDto> orderDtoList = new ArrayList<>();
         for (Order order : list) {
 //            List<OrderLog> logs = iOrderLogService.list(new QueryWrapper<OrderLog>().eq("order_status", DeliveryStatusEnum.IN_DELIVERY.status).eq("order_id", order.getId()));
 //            if (!CollectionUtils.isEmpty(logs)) {
 //                order.setTakeTime(logs.get(0).getCreateTime());
 //            }
-
+            OrderDto dto = new OrderDto();
+            BeanUtils.copyProperties(order, dto);
             if (order.getDeliveryStatus().equals(DeliveryStatusEnum.ORDERS_TO_BE_RECEIVED.status)) {
-                order.setDeliveryLogo("https://ecloud-cdn.51sssd.com/20210317/e24a425797f54f64b808b95beae37285.png");
-                order.setDeliveryName("全网推单中...");
+                dto.setDeliveryLogo("https://ecloud-cdn.51sssd.com/20210317/e24a425797f54f64b808b95beae37285.png");
+                dto.setDeliveryName("全网推单中...");
             }
             // 设置门牌号,兼容app改版、老版本
             if (StringUtils.isNotBlank(order.getSendStreet()) && StringUtils.isNotBlank(order.getSendAddress()) && !order.getSendAddress().endsWith(order.getSendStreet())) {
-                order.setSendAddress(order.getSendAddress() + order.getSendStreet());
+                dto.setSendAddress(order.getSendAddress() + order.getSendStreet());
             }
             if (StringUtils.isNotBlank(order.getReceiptStreet()) && StringUtils.isNotBlank(order.getReceiptAddress()) && !order.getReceiptAddress().endsWith(order.getReceiptStreet())) {
-                order.setReceiptAddress(order.getReceiptAddress() + order.getReceiptStreet());
+                dto.setReceiptAddress(order.getReceiptAddress() + order.getReceiptStreet());
             }
             // 门店名称
             if (order.getShopId() != null) {
                 Shop shop = iShopService.getById(order.getShopId());
                 if (shop != null) {
-                    order.setShopName(shop.getName());
+                    dto.setShopName(shop.getName());
                 }
             }
             if (order.getDeliveryId() != null){
                 DspDelivery dspDelivery = iDspDeliveryService.getById(order.getDeliveryId());
                 if (dspDelivery != null){
-                    order.setType(dspDelivery.getType());
+                    dto.setType(dspDelivery.getType());
+                    dto.setCustomerPhone(dspDelivery.getCustomerPhone());
                 }
             }
+            this.setOrderInfoTime(dto);
+            orderDtoList.add(dto);
         }
-        return list;
+        return orderDtoList;
     }
 
     @Override

lb-module/src/main/java/com/ydd/module/domain/Recharge.java

@@ -93,4 +93,8 @@ private static final long serialVersionUID=1L;
 
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
+    @TableField(exist = false)
+    private String startTime;
+    @TableField(exist = false)
+    private String endTime;
 }

lb-module/src/main/java/com/ydd/module/dto/MemberBalanceLogDto.java

@@ -87,4 +87,5 @@ public class MemberBalanceLogDto implements Serializable {
     @JsonIgnore
     private Integer waimaiOrderId;
 
+    private String cityName;
 }

lb-module/src/main/java/com/ydd/module/service/impl/RechargeServiceImpl.java

@@ -74,6 +74,12 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
         if (recharge.getPayTime() != null){
             lqw.eq(Recharge::getPayTime ,recharge.getPayTime());
         }
+        if (StringUtils.isNotBlank(recharge.getStartTime())){
+            lqw.ge(Recharge::getCreateTime ,recharge.getStartTime());
+        }
+        if (StringUtils.isNotBlank(recharge.getEndTime())){
+            lqw.le(Recharge::getCreateTime ,recharge.getEndTime());
+        }
         return this.list(lqw);
     }