diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java index 36e9eafe6..c0f3e9491 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java @@ -68,10 +68,6 @@ public class QueryOrderDTO extends BaseEntity { */ private String endTime; - // private int pageSize; - // - // private int pageNum; - private List orderCodeList; /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java index 95bda260a..492cae97f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java @@ -7,6 +7,7 @@ import com.jsowell.pile.vo.base.MemberGroupStationVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.web.MemberDiscountVO; import com.jsowell.pile.vo.web.MemberGroupVO; +import com.jsowell.pile.vo.web.OrderListVO; import java.util.List; @@ -104,12 +105,27 @@ public interface MemberGroupService { */ List queryStationList(MemberGroupDTO dto); + /** + * 集团移除站点 + * @param dto + * @return + */ int removeStationFromMemberGroup(MemberGroupDTO dto); + /** + * 集团移除会员 + * @param dto + * @return + */ int removeMemberFromMemberGroup(MemberGroupDTO dto); /** * 根据memberGroup查询车辆消费记录 */ List queryMemberGroupConsumptionList(String groupCode); + + /** + * 查询车辆消费明细 + */ + List queryConsumptionDetailListByVinCode(String groupCode, String vinCode); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java index 35b28dc64..3ee2c6a65 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java @@ -12,6 +12,7 @@ import com.jsowell.pile.domain.MemberGroup; import com.jsowell.pile.domain.MemberGroupRelation; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.dto.MemberGroupDTO; +import com.jsowell.pile.dto.QueryOrderDTO; import com.jsowell.pile.mapper.MemberGroupMapper; import com.jsowell.pile.service.*; 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.MemberDiscountVO; import com.jsowell.pile.vo.web.MemberGroupVO; +import com.jsowell.pile.vo.web.OrderListVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.BeanUtils; @@ -351,6 +353,13 @@ public class MemberGroupServiceImpl implements MemberGroupService { return resultList; } + @Override + public List queryConsumptionDetailListByVinCode(String groupCode, String vinCode) { + QueryOrderDTO dto = new QueryOrderDTO(); + List orderListVOS = orderBasicInfoService.selectOrderBasicInfoList(dto); + return null; + } + /** * 会员与集团的关系保存到数据库 * @param memberId 会员id diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index f1d00a941..af229eea8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -280,15 +280,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } 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.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus()));