From 9a7cfd5c8c69c5596a01c4c73f744f756d6eb226 Mon Sep 17 00:00:00 2001 From: atao Date: Wed, 9 Aug 2017 18:01:11 +0800 Subject: [PATCH] 提交代码 --- .gitignore | 2 +- src/main/java/com/rnt/service/OrderService.java | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------ 2 files changed, 70 insertions(+), 73 deletions(-) diff --git a/.gitignore b/.gitignore index 1ced0ab..d20e0b0 100644 --- a/.gitignore +++ b/.gitignore @@ -89,6 +89,6 @@ local.properties # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -.gitignore + .idea/ src/main/java/com/rnt/plugins/ diff --git a/src/main/java/com/rnt/service/OrderService.java b/src/main/java/com/rnt/service/OrderService.java index 54ebec8..b372764 100644 --- a/src/main/java/com/rnt/service/OrderService.java +++ b/src/main/java/com/rnt/service/OrderService.java @@ -9,9 +9,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.beetl.sql.core.kit.StringKit; - import com.alibaba.fastjson.JSONObject; + import com.jfinal.aop.Before; import com.jfinal.aop.Duang; import com.jfinal.log.Log; @@ -19,7 +18,6 @@ import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.tx.Tx; import com.rnt.commo.enums.DSEnum; import com.rnt.commo.enums.DataStatusEnum; -import com.rnt.commo.enums.ErrorType; import com.rnt.commo.enums.OrderTypeEnum; import com.rnt.commo.enums.PayOrderEnum; import com.rnt.commo.enums.SequenceTypeEnum; @@ -29,9 +27,9 @@ import com.rnt.model.zf.OrderDetailCard; import com.rnt.model.zf.OrderDetailPark; import com.rnt.model.zf.ParkOrderFlow; import com.rnt.model.zf.PayOrder; -import com.rnt.utils.DateUtil; import com.rnt.utils.SequenceUtil; import com.rnt.vo.OrderVO; +import org.beetl.sql.core.kit.StringKit; public class OrderService { @@ -46,11 +44,12 @@ public class OrderService { * @return 是否成功 */ @Before(Tx.class) - public Boolean payOrderSuccess(String payOrderId,String transId) { + public Boolean payOrderSuccess(String payOrderId, String transId) { logger.info("========支付成功后，修改单据状态==== start ===="); - logger.info("========支付成功后，修改单据状态 入参为:payOrderId="+payOrderId+"; transId="+transId); + logger.info("========支付成功后，修改单据状态 入参为:payOrderId=" + payOrderId + "; transId=" + transId); //修改支付单状态 - PayOrder payOrder = PayOrder.dao.findFirst("select * from td_b_pay_order t where t.pay_order_id = ?", payOrderId); + PayOrder payOrder = PayOrder.dao.findFirst("select * from td_b_pay_order t where t.pay_order_id = ?", + payOrderId); payOrder.setPayOrderState(Integer.valueOf(PayOrderEnum.PAY_ORDER_STATE_PAY_SUCCESS.getValue())); //微信端的订单交易流水 payOrder.setRltPayOrderId(transId); @@ -60,7 +59,7 @@ public class OrderService { //修改订单状态 Order order = Order.dao.findFirst("select * from td_b_order t where t.order_id = ?", orderId); order.setOrderState(OrderTypeEnum.ORDER_TYPE_3.value()); - flag = flag & order.update(); + flag = flag & order.update(); logger.info("修改订单，flag状态为: flag=" + flag); //查询订单明细表 @@ -70,16 +69,18 @@ public class OrderService { Integer orderDetailType = orderDetailCard.getOrderDetailType(); Long cardCoponsId = orderDetailCard.getPersonCardId(); CardCoupons cardCoupons = CardCoupons.dao.findById(cardCoponsId); - + //推送状态：1已推送，0：未推送 + //将卡卷信息推送状态设置为0: 未推送 + cardCoupons.setPushState(0); Integer orderType = order.getOrderType(); - if(OrderTypeEnum.PARK_ORDER_TYPE_1.value().equals(orderType)){ + if (OrderTypeEnum.PARK_ORDER_TYPE_1.value().equals(orderType)) { /**停车订单*/ /** 上面已将订单状态修改为已支付，无需后续操作了*/ logger.info("停车订单修改，将订单状态修改为已支付"); - - }else if(OrderTypeEnum.PARK_ORDER_TYPE_2.value().equals(orderType) || OrderTypeEnum.PARK_ORDER_TYPE_3.value().equals(orderType)){ + } else if (OrderTypeEnum.PARK_ORDER_TYPE_2.value().equals(orderType) || OrderTypeEnum.PARK_ORDER_TYPE_3.value() + .equals(orderType)) { /**年卡、月卡订单*/ if (OrderTypeEnum.ORDER_DETAIL_TYPE_BUY_CARD.value().equals(orderDetailType)) { /**购卡单*/ @@ -97,11 +98,10 @@ public class OrderService { } else { logger.info("无法识别的订单类型 orderDetailType=" + orderDetailType); } - }else{ + } else { logger.info("无法识别的订单类型 orderType=" + orderType); } - logger.info("========支付成功后，修改单据状态==== end ===="); return flag; } @@ -131,18 +131,19 @@ public class OrderService { return list; } - + /** * 通过订单好 + * * @param orderId * @return */ - public OrderDetailPark queryDetailParkByOrderId(String orderId){ - StringBuffer sql = new StringBuffer("select order_id,record_id"); - sql.append(" from td_b_order_detail_park a "); - sql.append(" where a.data_state =1"); - sql.append(" and a.order_id ? "); - OrderDetailPark orderDetailPark = new OrderDetailPark().findFirst(sql.toString(), orderId); + public OrderDetailPark queryDetailParkByOrderId(String orderId) { + StringBuffer sql = new StringBuffer("select order_id,record_id"); + sql.append(" from td_b_order_detail_park a "); + sql.append(" where a.data_state =1"); + sql.append(" and a.order_id ? "); + OrderDetailPark orderDetailPark = new OrderDetailPark().findFirst(sql.toString(), orderId); return orderDetailPark; } @@ -162,30 +163,30 @@ public class OrderService { logger.info("---begin订单信息更新,orderId=" + orderId); OrderVO orderVO = new OrderVO(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - Map resultmap = new HashMap(); + Map resultmap = new HashMap(); //1.查询支付订单 Order order = this.findOrderByOrderId(orderId); - logger.info("通过车牌号查询到的支付订单信息结果＝"+JSONObject.toJSON(order)); + logger.info("通过车牌号查询到的支付订单信息结果＝" + JSONObject.toJSON(order)); //2.调用查询费用接口 if (order != null && StringKit.isNotBlank(order.getOrderId())) { - resultmap = this.chosseBillQuery(order.getCarNumber(),order); - } + resultmap = this.chosseBillQuery(order.getCarNumber(), order); + } boolean orderUpdateFlg = false; int updateOrderDetailFlg = 0; //3.更新订单 - if (resultmap != null && resultmap.size() >0){ - Order updateOrder = new Order(); - updateOrder.setId(order.getId()); - updateOrder.setOrderId(order.getOrderId()); - updateOrder.setOrderType(Integer.valueOf(PayOrderEnum.PAY_RESOURCE_TYPE_PARK.getValue())); - updateOrder.setOrderState(Integer.valueOf(OrderTypeEnum.ORDER_TYPE_2.value())); - updateOrder.setOrderPayedFee(new BigDecimal(resultmap.get("order_payed_fee"))); - updateOrder.setOrderNotPayFee(new BigDecimal(resultmap.get("order_not_pay_fee"))); - updateOrder.setOrderTotalFee(new BigDecimal(resultmap.get("order_total_fee"))); - updateOrder.setModfiyDate(new Date()); - /**更新订单表.*/ - orderUpdateFlg = updateOrder.update(); - logger.info("更新订单结果="+(orderUpdateFlg ==true ? "成功!" :"失败!")); + if (resultmap != null && resultmap.size() > 0) { + Order updateOrder = new Order(); + updateOrder.setId(order.getId()); + updateOrder.setOrderId(order.getOrderId()); + updateOrder.setOrderType(Integer.valueOf(PayOrderEnum.PAY_RESOURCE_TYPE_PARK.getValue())); + updateOrder.setOrderState(Integer.valueOf(OrderTypeEnum.ORDER_TYPE_2.value())); + updateOrder.setOrderPayedFee(new BigDecimal(resultmap.get("order_payed_fee"))); + updateOrder.setOrderNotPayFee(new BigDecimal(resultmap.get("order_not_pay_fee"))); + updateOrder.setOrderTotalFee(new BigDecimal(resultmap.get("order_total_fee"))); + updateOrder.setModfiyDate(new Date()); + /**更新订单表.*/ + orderUpdateFlg = updateOrder.update(); + logger.info("更新订单结果=" + (orderUpdateFlg == true ? "成功!" : "失败!")); if (orderUpdateFlg) { StringBuffer sqls = new StringBuffer("update td_b_order_detail_park a "); sqls.append("set a.order_id =?,"); @@ -206,11 +207,11 @@ public class OrderService { Long.valueOf(resultmap.get("parking_duration")), new Date(), order.getOrderId()); - logger.info("更新停车订单明细结果="+(updateOrderDetailFlg > 0 ? "成功" : "失败")); + logger.info("更新停车订单明细结果=" + (updateOrderDetailFlg > 0 ? "成功" : "失败")); if (updateOrderDetailFlg > 0) { - //封装返回数据 + //封装返回数据 orderVO.setOrderId(order.getOrderId()); - } + } /**插入订单流水.*/ ParkOrderFlow parkOrderFlow = new ParkOrderFlow(); parkOrderFlow.setParkOrderFolwId(SequenceUtil.getNextOrderId(SequenceTypeEnum.ORDER_PARK_FLOW.value())); @@ -219,42 +220,41 @@ public class OrderService { parkOrderFlow.setProcResult(1); parkOrderFlow.save(); - } + } } - - logger.info("---end订单信息更新,结果=" +JSONObject.toJSON(orderVO)); + + logger.info("---end订单信息更新,结果=" + JSONObject.toJSON(orderVO)); return orderVO; } - + /** * 查询费用艾润或者青岛路侧费用查询接口.
+ * * @param carNum * @return */ - public Map chosseBillQuery(String carNum,Order order){ - OrderService orderService = Duang.duang(OrderService.class); - IRainQueryService iRainQueryService = Duang.duang(IRainQueryService.class); - Map reultMap = new HashMap(); - if (order != null && StringKit.isNotBlank(order.getOrderId())) { - logger.info("查询费用来源="+(order.getSourceType() ==2 ? "调用青岛路侧费用查询接口" :"调用艾润查询费用接口")); - if("1".equals(String.valueOf(order.getSourceType()))){//道闸:调用艾润查询费用接口 - /**调用艾润查询费用接口.*/ - reultMap = iRainQueryService.billQuery(carNum, order.getParkId()); - }else if("2".equals(String.valueOf(order.getSourceType())) - && StringKit.isNotBlank(order.getOrderId())){//调用青岛路侧查询费用接口 - /**查询停车记录id.*/ - OrderDetailPark OrderDetailPark = orderService.queryDetailParkByOrderId(order.getOrderId()); - if(OrderDetailPark != null && StringKit.isNotBlank(OrderDetailPark.getRecordId())){ - /**调用青岛路侧费用查询接口.*/ - reultMap =iRainQueryService.queryBillRoadside(OrderDetailPark.getRecordId()); - } - - } - } - return reultMap; - } + public Map chosseBillQuery(String carNum, Order order) { + OrderService orderService = Duang.duang(OrderService.class); + IRainQueryService iRainQueryService = Duang.duang(IRainQueryService.class); + Map reultMap = new HashMap(); + if (order != null && StringKit.isNotBlank(order.getOrderId())) { + logger.info("查询费用来源=" + (order.getSourceType() == 2 ? "调用青岛路侧费用查询接口" : "调用艾润查询费用接口")); + if ("1".equals(String.valueOf(order.getSourceType()))) {//道闸:调用艾润查询费用接口 + /**调用艾润查询费用接口.*/ + reultMap = iRainQueryService.billQuery(carNum, order.getParkId()); + } else if ("2".equals(String.valueOf(order.getSourceType())) + && StringKit.isNotBlank(order.getOrderId())) {//调用青岛路侧查询费用接口 + /**查询停车记录id.*/ + OrderDetailPark OrderDetailPark = orderService.queryDetailParkByOrderId(order.getOrderId()); + if (OrderDetailPark != null && StringKit.isNotBlank(OrderDetailPark.getRecordId())) { + /**调用青岛路侧费用查询接口.*/ + reultMap = iRainQueryService.queryBillRoadside(OrderDetailPark.getRecordId()); + } - + } + } + return reultMap; + } /** * 通过车牌查询待核算支付单信息.
@@ -273,12 +273,10 @@ public class OrderService { sql.append(" order by a.create_date DESC"); Order order = new Order().findFirst(sql.toString(), carNum); - - return order; } - + /** * 通过车牌查询待核算支付单信息.
* @@ -297,5 +295,4 @@ public class OrderService { return order; } - } -- libgit2 0.21.4