| | |
|---|
| | | }
|
|---|
| | |
|
|---|
| | | // 数据加工重新组织
|
|---|
| | | listDataFactory(listOrder, listGoods);
|
|---|
| | | listDataFactory(listOrder, listGoods, uid);
|
|---|
| | |
|
|---|
| | | return listOrder;
|
|---|
| | | }
|
|---|
| | |
|---|
| | | return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day);
|
|---|
| | | }
|
|---|
| | |
|
|---|
| | | public void listDataFactory(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods) {
|
|---|
| | | public void listDataFactory(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid) {
|
|---|
| | |
|
|---|
| | | /* 组合商品信息 */
|
|---|
| | | for (CommonOrderVO commonOrder : listGoods) {
|
|---|
| | |
|---|
| | | /* 订单状态 转换处理 */
|
|---|
| | | String orderStateContent = "";
|
|---|
| | | Map<String, String> orderStateMap = new HashMap<String, String>();
|
|---|
| | |
|
|---|
| | | Integer hongBaoState = order.getHongBaoState();
|
|---|
| | |
|
|---|
| | | |
|---|
| | | // 订单状态
|
|---|
| | | Integer orderState = order.getState();
|
|---|
| | | // 红包状态
|
|---|
| | | Integer hongBaoState = order.getHongBaoState();
|
|---|
| | | |
|---|
| | | Integer stateWholeOrder = order.getStateWholeOrder();
|
|---|
| | | if (CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO == stateWholeOrder) {
|
|---|
| | | // 整个订单部分失效：判断真实状态 订单、红包
|
|---|
| | | CommonOrderVO buFenOrder = commonOrderMapper.getBuFenOrderState(uid, order.getOrderNo());
|
|---|
| | | if (buFenOrder != null) {
|
|---|
| | | // 有效的订单状态
|
|---|
| | | orderState = buFenOrder.getState();
|
|---|
| | | // 有效的红包状态
|
|---|
| | | hongBaoState = buFenOrder.getHongBaoState();
|
|---|
| | | }
|
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | if (CommonOrder.STATE_FK == orderState) {
|
|---|
| | | orderStateContent = "已付款";
|
|---|
| | | } else if (CommonOrder.STATE_JS == orderState) {
|
|---|
