From cc55ffcea74c7d23dadaa0860befbcdf98f35341 Mon Sep 17 00:00:00 2001 From: admin <2780501319@qq.com> Date: 星期一, 16 九月 2019 23:22:13 +0800 Subject: [PATCH] 资金相关包目录修改 --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 269 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 187 insertions(+), 82 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java index 93915b6..64ffb41 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.yeshi.fanli.service.impl.order; import java.math.BigDecimal; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -19,6 +20,7 @@ import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper; import com.yeshi.fanli.dao.mybatis.order.CommonOrderTradeIdMapMapper; import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper; +import com.yeshi.fanli.dto.order.CommonOrderAddResultDTO; import com.yeshi.fanli.dto.pdd.PDDGoodsDetail; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.bus.user.HongBaoV2; @@ -52,6 +54,9 @@ import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; +import com.yeshi.fanli.util.TimeUtil; +import com.yeshi.fanli.util.VersionUtil; +import com.yeshi.fanli.util.account.UserUtil; import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory; import com.yeshi.fanli.util.factory.goods.CommonOrderFactory; import com.yeshi.fanli.util.jd.JDApiUtil; @@ -63,6 +68,7 @@ import com.yeshi.fanli.vo.msg.ClientTextStyleVO; import com.yeshi.fanli.vo.order.CommonOrderGoodsVO; import com.yeshi.fanli.vo.order.CommonOrderVO; +import com.yeshi.fanli.vo.order.WeiQuanInfo; import net.sf.json.JSONObject; @@ -211,9 +217,35 @@ } @Override - public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime, - Integer day, Integer source) { - return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day, source); + public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime, + Integer day, Integer source, Integer state, Integer stateOrder) { + return commonOrderMapper.countUserOrderToApp(uid, type, startTime, endTime, day, source, state, stateOrder); + } + + private BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid) { + BigDecimal weiQuanMoney = new BigDecimal(0); + if (listWQ != null && listWQ.size() > 0) { + for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) { + String tradeId = weiQuanOrder.getOrderItemId(); + // 鏌ヨ绾㈠寘 + List<String> tradeList = new ArrayList<>(); + tradeList.add(tradeId); + List<HongBaoV2> hongBaoList = hongBaoV2Service.listBySourceTypeAndTradeIdListAndUid(sourceType, uid, + tradeList); + if (hongBaoList != null && hongBaoList.size() > 0) { + CommonOrder commonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId); + if (commonOrder != null && commonOrder.getSettlement().compareTo(new BigDecimal(0)) > 0) { + BigDecimal wqMoney = MoneyBigDecimalUtil + .mul(hongBaoList.get(0).getMoney(), weiQuanOrder.getMoney()) + .divide(commonOrder.getSettlement(), 2, BigDecimal.ROUND_UP); + if (wqMoney.compareTo(hongBaoList.get(0).getMoney()) > 0) + wqMoney = hongBaoList.get(0).getMoney(); + weiQuanMoney = weiQuanMoney.add(wqMoney); + } + } + } + } + return weiQuanMoney; } public void listDataFactory(AcceptData acceptData, List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, @@ -324,7 +356,18 @@ SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd"); // 鏄惁瀛樺湪濂栧姳鍒� - boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid); + // boolean hasRewardCoupon = + // userSystemCouponService.hasRewardCoupon(uid); + boolean hasRewardCoupon = userSystemCouponService.getIncludeNotExchange(uid); + boolean exchangeCoupon = userSystemCouponService.getIncludeExchange(uid); + + // 2019.8.1寮�濮嬭繑鍥炵淮鏉冧俊鎭� + Date august = null; + try { + august = TimeUtil.parse("2019-08-01"); + } catch (ParseException e) { + e.printStackTrace(); + } /* 缁勭粐璁㈠崟鐘舵�� 绛変俊鎭� */ for (CommonOrderVO order : listOrder) { @@ -373,6 +416,11 @@ } } + BigDecimal hongBao = order.getHongBao(); + if (hongBao == null) { + hongBao = new BigDecimal(0); + } + if (CommonOrder.STATE_FK == orderState) { orderStateContent = "宸蹭粯娆�"; } else if (CommonOrder.STATE_JS == orderState) { @@ -389,25 +437,33 @@ .selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛"); boolean isPart = false;// 榛樿澶辨晥 + BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid); - if (listWQ != null && listWQ.size() > 0) { - BigDecimal fanTotalMoney = new BigDecimal(0); - for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) { - BigDecimal fanMoney = weiQuanOrder.getFanMoney(); - if (fanMoney != null) { - fanTotalMoney = MoneyBigDecimalUtil.add(fanTotalMoney, fanMoney); - } + if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) { + if (isPart) { + hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥 + } else { + hongBaoState = HongBaoV2.STATE_SHIXIAO; // 鍏ㄩ儴澶辨晥 } - - if (fanTotalMoney.compareTo(order.getHongBao()) < 0) { - isPart = true; - } - } - - if (isPart) { - hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥 } else { - hongBaoState = HongBaoV2.STATE_SHIXIAO; // 鍏ㄩ儴澶辨晥 + // 2019.8.1 杩斿洖缁存潈淇℃伅 + if (settleTime != null && august != null && settleTime.getTime() > august.getTime()) { + orderStateContent = "缁存潈鎴愬姛"; + WeiQuanInfo weiQuanInfo = new WeiQuanInfo(); + weiQuanInfo.setOldHongBao("楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString()); + // if (isPart) { + weiQuanInfo + .setWqHongBao("缁存潈锛�-楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString()); + hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney); + // } else { + // weiQuanInfo + // .setWqHongBao("缁存潈锛�-楼" + weiQuanMoney.setScale(2, + // BigDecimal.ROUND_DOWN).toString()); + // hongBao = MoneyBigDecimalUtil.sub(hongBao, + // weiQuanMoney); + // } + order.setWeiQuanInfo(weiQuanInfo); + } } } } @@ -494,43 +550,37 @@ hongbaoInfo = hongBaoState_Str + hongbaoInfo; - BigDecimal hongBao = order.getHongBao(); - if (hongBao == null) { - hongBao = new BigDecimal(0); - } Map<String, String> hongBaoMap = new HashMap<String, String>(); hongBaoMap.put("content", hongbaoInfo + " 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString()); hongBaoMap.put("fontColor", hongbaoInfoFontColor); order.setHongBaoInfo(hongBaoMap); + Integer sourceType = order.getSourceType(); // 闈炶嚜璐殑璁㈠崟 涓嶆樉绀鸿繑鍒┿�佸厤鍗曡鎯� if (HongBaoV2.TYPE_ZIGOU != hongBaoType) { order.setSignList(signList); } else { - Integer sourceType = order.getSourceType(); // 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍 if (sourceType == null) { - setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, null, signList); + setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null, + signList, acceptData); } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) { - setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, signList); + setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, + listRecordTB, signList, acceptData); } else if (sourceType == Constant.SOURCE_TYPE_JD) { - setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, signList); + setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, + listRecordJD, signList, acceptData); } else if (sourceType == Constant.SOURCE_TYPE_PDD) { - setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, signList); + setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, + listRecordPDD, signList, acceptData); } } - // 閭�璇� 闅愯棌璁㈠崟鍙� - if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) { - String orderNo = order.getOrderNo(); - orderNo = orderNo.substring(0, orderNo.length() - 6); - order.setOrderNo(orderNo + "******"); - } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType - || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType - || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) { - String orderNo = order.getOrderNo(); - orderNo = orderNo.substring(0, orderNo.length() - 6); - order.setOrderNo(orderNo + "******"); + // 鍒嗕韩銆侀個璇� 闅愯棌璁㈠崟鍙� + if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_YAOQING == hongBaoType + || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType + || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) { + order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo())); } } } @@ -544,8 +594,9 @@ * @param list * @param signList */ - public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, - Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList) { + public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, boolean exchangeCoupon, + Integer hongBaoState, Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList, + AcceptData acceptData) { // 鏄惁鍏嶅崟鍟嗗搧 boolean freeOrder = false; @@ -565,7 +616,8 @@ signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖 } else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType) - || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) { + || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType) + || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) { if (UserSystemCouponRecord.STATE_FREE_ON == state) { // 鍏嶅崟涓� @@ -591,6 +643,21 @@ // 璁㈠崟鏍囪瘑 order.setSignList(signList); + // 1.6.5 鏄惁瀛樺湪鏂板厬鎹㈢殑鍒� + if (!hasRewardCoupon && exchangeCoupon) { + try { + Date thirdCreateTime = order.getThirdCreateTime(); + if (thirdCreateTime != null) { + long downOrderTime = thirdCreateTime.getTime(); + long limitDate = TimeUtil.convertDateToTemp("2019-09-05"); + if (downOrderTime > limitDate) + hasRewardCoupon = true; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + boolean rewardOrder = false; int type = 1; // 1 甯歌璺宠浆椤甸潰 2寮瑰嚭閫夐」锛堝鍔卞埜锛� @@ -613,6 +680,9 @@ Map<String, Object> jumpLink = new HashMap<String, Object>(); jumpLink.put("orderNo", order.getOrderNo()); + if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) { + jumpLink.put("goodsType", order.getSourceType()); + } Map<String, Object> jump = new HashMap<String, Object>(); jump.put("type", type); @@ -635,6 +705,9 @@ Map<String, Object> jumpLink = new HashMap<String, Object>(); jumpLink.put("orderNo", order.getOrderNo()); + if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) { + jumpLink.put("goodsType", order.getSourceType()); + } Map<String, Object> jump = new HashMap<String, Object>(); jump.put("type", 1); // 椤甸潰璺宠浆 @@ -656,8 +729,9 @@ @Transactional @Override - public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid) throws CommonOrderException { - List<CommonOrder> commonOrderList = new ArrayList<>(); + public List<CommonOrderAddResultDTO> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid) + throws CommonOrderException { + List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>(); // 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵�� int invalidCount = 0; for (TaoBaoOrder tb : taoBaoOrders) { @@ -717,8 +791,9 @@ @Transactional @Override - public List<CommonOrder> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException { - List<CommonOrder> commonOrderList = new ArrayList<>(); + public List<CommonOrderAddResultDTO> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) + throws CommonOrderException { + List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>(); // 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵�� int invalidCount = 0; for (PDDOrder order : pddOrderList) { @@ -757,16 +832,6 @@ commonOrderGoodsMapper.insertSelective(cog); newCommonOrder.setCommonOrderGoods(cog); } else { - if (!Constant.IS_OUTNET) { - PDDGoodsDetail pddGoods = null; - pddGoods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(cog.getGoodsId())); - if (pddGoods != null) { - cog = CommonOrderGoodsFactory.create(pddGoods); - commonGoodsList.get(0).setPicture(cog.getPicture()); - commonOrderGoodsMapper.updateByPrimaryKeySelective(commonGoodsList.get(0)); - } - } - } newCommonOrder.setUserInfo(new UserInfo(uid)); commonOrderList.add(addCommonOrder(newCommonOrder)); @@ -776,8 +841,8 @@ @Transactional @Override - public List<CommonOrder> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException { - List<CommonOrder> commonOrderList = new ArrayList<>(); + public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException { + List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>(); // 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵�� int invalidCount = 0; for (JDOrderItem tb : jdOrder.getOrderItemList()) { @@ -812,22 +877,26 @@ if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧 { JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId()); + if (goods == null) { + goods = JDUtil.getGoodsFromWeb(itemOrder.getSkuId()); + } + + if (goods == null) { + goods = new JDGoods(); + goods.setSkuName(itemOrder.getSkuName()); + goods.setPrice(itemOrder.getPrice()); + goods.setSkuId(itemOrder.getSkuId()); + } if (goods != null) { cog = CommonOrderGoodsFactory.create(goods); } + cog.setCreateTime(new Date()); cog.setUpdateTime(new Date()); commonOrderGoodsMapper.insertSelective(cog); } else { - if (!Constant.IS_OUTNET) { - JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId()); - if(goods==null) - goods=JDUtil.getGoodsFromWeb(itemOrder.getSkuId()); - commonGoodsList.get(0).setTitle(goods.getSkuName()); - commonGoodsList.get(0).setPicture(goods.getPicUrl()); - commonOrderGoodsMapper.updateByPrimaryKeySelective(commonGoodsList.get(0)); - } + } newCommonOrder.setUserInfo(new UserInfo(uid)); commonOrderList.add(addCommonOrder(newCommonOrder)); @@ -841,7 +910,7 @@ * @param commonOrder */ @Transactional - private CommonOrder addCommonOrder(CommonOrder commonOrder) throws CommonOrderException { + private CommonOrderAddResultDTO addCommonOrder(CommonOrder commonOrder) throws CommonOrderException { // 鍒ゆ柇鍟嗗搧鏄惁瀛樺湪 if (commonOrder == null) throw new CommonOrderException(1, "璁㈠崟涓虹┖"); @@ -874,10 +943,9 @@ if (!StringUtil.isNullOrEmpty(commonOrder.getTradeId())) oldCommonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(commonOrder.getSourceType(), commonOrder.getTradeId()); - else - oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(), - commonOrder.getSourceType(), commonOrder.getOrderBy()); - + else { + throw new CommonOrderException(10, "浜ゆ槗ID涓虹┖"); + } if (oldCommonOrder == null)// 鏂板 { commonOrder.setCreateTime(new Date()); @@ -885,12 +953,13 @@ // 鎻掑叆鏄犲皠锛屼繚璇佷氦鏄揑D鐨勫畬鏁存�� commonOrderTradeIdMapMapper.insertSelective(new CommonOrderTradeIdMap(commonOrder.getId(), commonOrder.getTradeId(), new Date(), commonOrder.getSourceType())); - return commonOrder; + return new CommonOrderAddResultDTO(commonOrder, CommonOrderAddResultDTO.TYPE_ADD); } else {// 淇敼 // 宸茬粡缁撶畻锛屽凡缁忓け鏁堬紝鐘舵�佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊 if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX + || oldCommonOrder.getState() == CommonOrder.STATE_WQ || (oldCommonOrder.getState().intValue() == commonOrder.getState())) { - return oldCommonOrder; + return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE); } // 浜ゆ槗ID涓�鑷存墠淇敼 if (commonOrder.getTradeId() != null @@ -906,9 +975,10 @@ updateCommonOrder.setUpdateTime(new Date()); updateCommonOrder.setTradeId(commonOrder.getTradeId()); commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder); - return commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()); + return new CommonOrderAddResultDTO(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()), + CommonOrderAddResultDTO.TYPE_UPDATE); } else - return oldCommonOrder; + return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE); } } @@ -1004,8 +1074,14 @@ Integer type, Integer orderState, String startTime, String endTime, Integer source) throws CommonOrderException { - List<CommonOrderVO> list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, - startTime, endTime, source); + List<CommonOrderVO> list = null; + + if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗� + list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState, + startTime, endTime, source); + } else + list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime, + source); if (list == null) { list = new ArrayList<CommonOrderVO>(); @@ -1133,9 +1209,12 @@ String systemCouponType = couponRecord.getCouponType(); Integer couponState = couponRecord.getState(); if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType) - || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) { + || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType) + || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) { if (UserSystemCouponRecord.STATE_SUCCESS == couponState) { // 鍏嶅崟鎴愬姛 + order.setOtherState(2); + } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) { order.setOtherState(1); } } @@ -1148,9 +1227,12 @@ String systemCouponType = couponRecord.getCouponType(); Integer couponState = couponRecord.getState(); if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType) - || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) { + || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType) + || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) { if (UserSystemCouponRecord.STATE_SUCCESS == couponState) { // 鍏嶅崟鎴愬姛 + order.setOtherState(2); + } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) { order.setOtherState(1); } } @@ -1163,9 +1245,12 @@ String systemCouponType = couponRecord.getCouponType(); Integer couponState = couponRecord.getState(); if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType) - || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) { + || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType) + || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) { if (UserSystemCouponRecord.STATE_SUCCESS == couponState) { // 鍏嶅崟鎴愬姛 + order.setOtherState(2); + } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) { order.setOtherState(1); } } @@ -1182,7 +1267,11 @@ @Override public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState, String startTime, String endTime, Integer source) throws CommonOrderException { - return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source); + if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗� + return commonOrderMapper.countQueryWithNoChild(keyType, key, state, type, orderState, startTime, endTime, + source); + } else + return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source); } @Override @@ -1361,4 +1450,20 @@ (page - 1) * pageSize, pageSize); } + @Override + public List<CommonOrder> getByOrderNo(Long uid, String orderNO) { + return commonOrderMapper.getByOrderNo(uid, orderNO); + } + + @Override + public CommonOrder selectLatestValidByUid(Long uid) { + List<Integer> stateList = new ArrayList<>(); + stateList.add(CommonOrder.STATE_FK); + stateList.add(CommonOrder.STATE_JS); + List<CommonOrder> commonOrderList = commonOrderMapper.listByUid(uid, stateList, 0, 1); + if (commonOrderList == null || commonOrderList.size() == 0) + return null; + return commonOrderList.get(0); + } + } -- Gitblit v1.8.0