autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-15 15:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-03-01 09:05:33 +08:00
parent cad9009503
commit 84ee84c2a6
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java
View File

@@ -68,10 +68,6 @@ public class QueryOrderDTO extends BaseEntity {
*/ */
private String endTime; private String endTime;
// private int pageSize;
//
// private int pageNum;
private List<String> orderCodeList; private List<String> orderCodeList;
/** /**

16
jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java
View File

@@ -7,6 +7,7 @@ import com.jsowell.pile.vo.base.MemberGroupStationVO;
import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.web.MemberDiscountVO; import com.jsowell.pile.vo.web.MemberDiscountVO;
import com.jsowell.pile.vo.web.MemberGroupVO; import com.jsowell.pile.vo.web.MemberGroupVO;
import com.jsowell.pile.vo.web.OrderListVO;
import java.util.List; import java.util.List;
@@ -104,12 +105,27 @@ public interface MemberGroupService {
*/ */
List<MemberGroupStationVO> queryStationList(MemberGroupDTO dto); List<MemberGroupStationVO> queryStationList(MemberGroupDTO dto);
/**
* 集团移除站点
* @param dto
* @return
*/
int removeStationFromMemberGroup(MemberGroupDTO dto); int removeStationFromMemberGroup(MemberGroupDTO dto);
/**
* 集团移除会员
* @param dto
* @return
*/
int removeMemberFromMemberGroup(MemberGroupDTO dto); int removeMemberFromMemberGroup(MemberGroupDTO dto);
/** /**
* 根据memberGroup查询车辆消费记录 * 根据memberGroup查询车辆消费记录
*/ */
List<MemberGroupConsumptionVO> queryMemberGroupConsumptionList(String groupCode); List<MemberGroupConsumptionVO> queryMemberGroupConsumptionList(String groupCode);
/**
* 查询车辆消费明细
*/
List<OrderListVO> queryConsumptionDetailListByVinCode(String groupCode, String vinCode);
} }

9
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
View File

@@ -12,6 +12,7 @@ import com.jsowell.pile.domain.MemberGroup;
import com.jsowell.pile.domain.MemberGroupRelation; import com.jsowell.pile.domain.MemberGroupRelation;
import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.dto.MemberGroupDTO; import com.jsowell.pile.dto.MemberGroupDTO;
import com.jsowell.pile.dto.QueryOrderDTO;
import com.jsowell.pile.mapper.MemberGroupMapper; import com.jsowell.pile.mapper.MemberGroupMapper;
import com.jsowell.pile.service.*; import com.jsowell.pile.service.*;
import com.jsowell.pile.vo.base.MemberGroupConsumptionVO; import com.jsowell.pile.vo.base.MemberGroupConsumptionVO;
@@ -20,6 +21,7 @@ import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.pile.vo.web.BillingTemplateVO;
import com.jsowell.pile.vo.web.MemberDiscountVO; import com.jsowell.pile.vo.web.MemberDiscountVO;
import com.jsowell.pile.vo.web.MemberGroupVO; import com.jsowell.pile.vo.web.MemberGroupVO;
import com.jsowell.pile.vo.web.OrderListVO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@@ -351,6 +353,13 @@ public class MemberGroupServiceImpl implements MemberGroupService {
return resultList; return resultList;
} }
@Override
public List<OrderListVO> queryConsumptionDetailListByVinCode(String groupCode, String vinCode) {
QueryOrderDTO dto = new QueryOrderDTO();
List<OrderListVO> orderListVOS = orderBasicInfoService.selectOrderBasicInfoList(dto);
return null;
}
/** /**
* 会员与集团的关系保存到数据库 * 会员与集团的关系保存到数据库
* @param memberId 会员id * @param memberId 会员id

9
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -280,15 +280,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
} }
for (OrderListVO orderListVO : orderListVOS) { for (OrderListVO orderListVO : orderListVOS) {
// 如果是微信支付，通过订单号查询微信支付单号
// logger.info("如果是微信支付，通过订单号查询微信支付单号 orderListVO:{}", JSON.toJSONString(orderListVO));
// if (StringUtils.equals(PaymentInstitutionsEnum.ADAPAY.getValue(), orderListVO.getPaymentInstitutions())) {
// AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode());
// orderListVO.setOutTradeNo(adapayCallbackRecord.getPaymentId());
// } else if (StringUtils.equals(PaymentInstitutionsEnum.WECHAT_PAY.getValue(), orderListVO.getPaymentInstitutions())) {
// WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderListVO.getOrderCode());
// orderListVO.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo());
// }
orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode()); orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode());
orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus())); orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus()));