BJ_ZTEITS-Developers / zteits-rnt-wx

Commit 9a7cfd5c8c69c5596a01c4c73f744f756d6eb226

Authored by atao
1 parent 07eaa5b4

提交代码

Inline Side-by-side
Showing 2 changed files with 70 additions and 73 deletions
.gitignore
  View file @9a7cfd5
... ... @@ -89,6 +89,6 @@ local.properties
89 89 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
90 90 hs_err_pid*
91 91  
92   -.gitignore
  92 +
93 93 .idea/
94 94 src/main/java/com/rnt/plugins/
... ...
src/main/java/com/rnt/service/OrderService.java
  View file @9a7cfd5
... ... @@ -9,9 +9,8 @@ import java.util.HashMap;
9 9 import java.util.List;
10 10 import java.util.Map;
11 11  
12   -import org.beetl.sql.core.kit.StringKit;
13   -
14 12 import com.alibaba.fastjson.JSONObject;
  13 +
15 14 import com.jfinal.aop.Before;
16 15 import com.jfinal.aop.Duang;
17 16 import com.jfinal.log.Log;
... ... @@ -19,7 +18,6 @@ import com.jfinal.plugin.activerecord.Db;
19 18 import com.jfinal.plugin.activerecord.tx.Tx;
20 19 import com.rnt.commo.enums.DSEnum;
21 20 import com.rnt.commo.enums.DataStatusEnum;
22   -import com.rnt.commo.enums.ErrorType;
23 21 import com.rnt.commo.enums.OrderTypeEnum;
24 22 import com.rnt.commo.enums.PayOrderEnum;
25 23 import com.rnt.commo.enums.SequenceTypeEnum;
... ... @@ -29,9 +27,9 @@ import com.rnt.model.zf.OrderDetailCard;
29 27 import com.rnt.model.zf.OrderDetailPark;
30 28 import com.rnt.model.zf.ParkOrderFlow;
31 29 import com.rnt.model.zf.PayOrder;
32   -import com.rnt.utils.DateUtil;
33 30 import com.rnt.utils.SequenceUtil;
34 31 import com.rnt.vo.OrderVO;
  32 +import org.beetl.sql.core.kit.StringKit;
35 33  
36 34 public class OrderService {
37 35  
... ... @@ -46,11 +44,12 @@ public class OrderService {
46 44 * @return 是否成功
47 45 */
48 46 @Before(Tx.class)
49   - public Boolean payOrderSuccess(String payOrderId,String transId) {
  47 + public Boolean payOrderSuccess(String payOrderId, String transId) {
50 48 logger.info("========支付成功后，修改单据状态==== start ====");
51   - logger.info("========支付成功后，修改单据状态 入参为:payOrderId="+payOrderId+"; transId="+transId);
  49 + logger.info("========支付成功后，修改单据状态 入参为:payOrderId=" + payOrderId + "; transId=" + transId);
52 50 //修改支付单状态
53   - PayOrder payOrder = PayOrder.dao.findFirst("select * from td_b_pay_order t where t.pay_order_id = ?", payOrderId);
  51 + PayOrder payOrder = PayOrder.dao.findFirst("select * from td_b_pay_order t where t.pay_order_id = ?",
  52 + payOrderId);
54 53 payOrder.setPayOrderState(Integer.valueOf(PayOrderEnum.PAY_ORDER_STATE_PAY_SUCCESS.getValue()));
55 54 //微信端的订单交易流水
56 55 payOrder.setRltPayOrderId(transId);
... ... @@ -60,7 +59,7 @@ public class OrderService {
60 59 //修改订单状态
61 60 Order order = Order.dao.findFirst("select * from td_b_order t where t.order_id = ?", orderId);
62 61 order.setOrderState(OrderTypeEnum.ORDER_TYPE_3.value());
63   - flag = flag & order.update();
  62 + flag = flag & order.update();
64 63 logger.info("修改订单，flag状态为: flag=" + flag);
65 64  
66 65 //查询订单明细表
... ... @@ -70,16 +69,18 @@ public class OrderService {
70 69 Integer orderDetailType = orderDetailCard.getOrderDetailType();
71 70 Long cardCoponsId = orderDetailCard.getPersonCardId();
72 71 CardCoupons cardCoupons = CardCoupons.dao.findById(cardCoponsId);
73   -
  72 + //推送状态：1已推送，0：未推送
  73 + //将卡卷信息推送状态设置为0: 未推送
  74 + cardCoupons.setPushState(0);
74 75 Integer orderType = order.getOrderType();
75 76  
76   - if(OrderTypeEnum.PARK_ORDER_TYPE_1.value().equals(orderType)){
  77 + if (OrderTypeEnum.PARK_ORDER_TYPE_1.value().equals(orderType)) {
77 78 /**停车订单*/
78 79 /** 上面已将订单状态修改为已支付，无需后续操作了*/
79 80 logger.info("停车订单修改，将订单状态修改为已支付");
80 81  
81   -
82   - }else if(OrderTypeEnum.PARK_ORDER_TYPE_2.value().equals(orderType) || OrderTypeEnum.PARK_ORDER_TYPE_3.value().equals(orderType)){
  82 + } else if (OrderTypeEnum.PARK_ORDER_TYPE_2.value().equals(orderType) || OrderTypeEnum.PARK_ORDER_TYPE_3.value()
  83 + .equals(orderType)) {
83 84 /**年卡、月卡订单*/
84 85 if (OrderTypeEnum.ORDER_DETAIL_TYPE_BUY_CARD.value().equals(orderDetailType)) {
85 86 /**购卡单*/
... ... @@ -97,11 +98,10 @@ public class OrderService {
97 98 } else {
98 99 logger.info("无法识别的订单类型 orderDetailType=" + orderDetailType);
99 100 }
100   - }else{
  101 + } else {
101 102 logger.info("无法识别的订单类型 orderType=" + orderType);
102 103 }
103 104  
104   -
105 105 logger.info("========支付成功后，修改单据状态==== end ====");
106 106 return flag;
107 107 }
... ... @@ -131,18 +131,19 @@ public class OrderService {
131 131  
132 132 return list;
133 133 }
134   -
  134 +
135 135 /**
136 136 * 通过订单好
  137 + *
137 138 * @param orderId
138 139 * @return
139 140 */
140   - public OrderDetailPark queryDetailParkByOrderId(String orderId){
141   - StringBuffer sql = new StringBuffer("select order_id,record_id");
142   - sql.append(" from td_b_order_detail_park a ");
143   - sql.append(" where a.data_state =1");
144   - sql.append(" and a.order_id ? ");
145   - OrderDetailPark orderDetailPark = new OrderDetailPark().findFirst(sql.toString(), orderId);
  141 + public OrderDetailPark queryDetailParkByOrderId(String orderId) {
  142 + StringBuffer sql = new StringBuffer("select order_id,record_id");
  143 + sql.append(" from td_b_order_detail_park a ");
  144 + sql.append(" where a.data_state =1");
  145 + sql.append(" and a.order_id ? ");
  146 + OrderDetailPark orderDetailPark = new OrderDetailPark().findFirst(sql.toString(), orderId);
146 147 return orderDetailPark;
147 148 }
148 149  
... ... @@ -162,30 +163,30 @@ public class OrderService {
162 163 logger.info("---begin订单信息更新,orderId=" + orderId);
163 164 OrderVO orderVO = new OrderVO();
164 165 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
165   - Map<String,String> resultmap = new HashMap<String,String>();
  166 + Map<String, String> resultmap = new HashMap<String, String>();
166 167 //1.查询支付订单
167 168 Order order = this.findOrderByOrderId(orderId);
168   - logger.info("通过车牌号查询到的支付订单信息结果＝"+JSONObject.toJSON(order));
  169 + logger.info("通过车牌号查询到的支付订单信息结果＝" + JSONObject.toJSON(order));
169 170 //2.调用查询费用接口
170 171 if (order != null && StringKit.isNotBlank(order.getOrderId())) {
171   - resultmap = this.chosseBillQuery(order.getCarNumber(),order);
172   - }
  172 + resultmap = this.chosseBillQuery(order.getCarNumber(), order);
  173 + }
173 174 boolean orderUpdateFlg = false;
174 175 int updateOrderDetailFlg = 0;
175 176 //3.更新订单
176   - if (resultmap != null && resultmap.size() >0){
177   - Order updateOrder = new Order();
178   - updateOrder.setId(order.getId());
179   - updateOrder.setOrderId(order.getOrderId());
180   - updateOrder.setOrderType(Integer.valueOf(PayOrderEnum.PAY_RESOURCE_TYPE_PARK.getValue()));
181   - updateOrder.setOrderState(Integer.valueOf(OrderTypeEnum.ORDER_TYPE_2.value()));
182   - updateOrder.setOrderPayedFee(new BigDecimal(resultmap.get("order_payed_fee")));
183   - updateOrder.setOrderNotPayFee(new BigDecimal(resultmap.get("order_not_pay_fee")));
184   - updateOrder.setOrderTotalFee(new BigDecimal(resultmap.get("order_total_fee")));
185   - updateOrder.setModfiyDate(new Date());
186   - /**更新订单表.*/
187   - orderUpdateFlg = updateOrder.update();
188   - logger.info("更新订单结果="+(orderUpdateFlg ==true ? "成功!" :"失败!"));
  177 + if (resultmap != null && resultmap.size() > 0) {
  178 + Order updateOrder = new Order();
  179 + updateOrder.setId(order.getId());
  180 + updateOrder.setOrderId(order.getOrderId());
  181 + updateOrder.setOrderType(Integer.valueOf(PayOrderEnum.PAY_RESOURCE_TYPE_PARK.getValue()));
  182 + updateOrder.setOrderState(Integer.valueOf(OrderTypeEnum.ORDER_TYPE_2.value()));
  183 + updateOrder.setOrderPayedFee(new BigDecimal(resultmap.get("order_payed_fee")));
  184 + updateOrder.setOrderNotPayFee(new BigDecimal(resultmap.get("order_not_pay_fee")));
  185 + updateOrder.setOrderTotalFee(new BigDecimal(resultmap.get("order_total_fee")));
  186 + updateOrder.setModfiyDate(new Date());
  187 + /**更新订单表.*/
  188 + orderUpdateFlg = updateOrder.update();
  189 + logger.info("更新订单结果=" + (orderUpdateFlg == true ? "成功!" : "失败!"));
189 190 if (orderUpdateFlg) {
190 191 StringBuffer sqls = new StringBuffer("update td_b_order_detail_park a ");
191 192 sqls.append("set a.order_id =?,");
... ... @@ -206,11 +207,11 @@ public class OrderService {
206 207 Long.valueOf(resultmap.get("parking_duration")),
207 208 new Date(),
208 209 order.getOrderId());
209   - logger.info("更新停车订单明细结果="+(updateOrderDetailFlg > 0 ? "成功" : "失败"));
  210 + logger.info("更新停车订单明细结果=" + (updateOrderDetailFlg > 0 ? "成功" : "失败"));
210 211 if (updateOrderDetailFlg > 0) {
211   - //封装返回数据
  212 + //封装返回数据
212 213 orderVO.setOrderId(order.getOrderId());
213   - }
  214 + }
214 215 /**插入订单流水.*/
215 216 ParkOrderFlow parkOrderFlow = new ParkOrderFlow();
216 217 parkOrderFlow.setParkOrderFolwId(SequenceUtil.getNextOrderId(SequenceTypeEnum.ORDER_PARK_FLOW.value()));
... ... @@ -219,42 +220,41 @@ public class OrderService {
219 220 parkOrderFlow.setProcResult(1);
220 221 parkOrderFlow.save();
221 222  
222   - }
  223 + }
223 224 }
224   -
225   - logger.info("---end订单信息更新,结果=" +JSONObject.toJSON(orderVO));
  225 +
  226 + logger.info("---end订单信息更新,结果=" + JSONObject.toJSON(orderVO));
226 227 return orderVO;
227 228 }
228   -
  229 +
229 230 /**
230 231 * 查询费用艾润或者青岛路侧费用查询接口.<br/>
  232 + *
231 233 * @param carNum
232 234 * @return
233 235 */
234   - public Map<String, String> chosseBillQuery(String carNum,Order order){
235   - OrderService orderService = Duang.duang(OrderService.class);
236   - IRainQueryService iRainQueryService = Duang.duang(IRainQueryService.class);
237   - Map<String, String> reultMap = new HashMap<String, String>();
238   - if (order != null && StringKit.isNotBlank(order.getOrderId())) {
239   - logger.info("查询费用来源="+(order.getSourceType() ==2 ? "调用青岛路侧费用查询接口" :"调用艾润查询费用接口"));
240   - if("1".equals(String.valueOf(order.getSourceType()))){//道闸:调用艾润查询费用接口
241   - /**调用艾润查询费用接口.*/
242   - reultMap = iRainQueryService.billQuery(carNum, order.getParkId());
243   - }else if("2".equals(String.valueOf(order.getSourceType()))
244   - && StringKit.isNotBlank(order.getOrderId())){//调用青岛路侧查询费用接口
245   - /**查询停车记录id.*/
246   - OrderDetailPark OrderDetailPark = orderService.queryDetailParkByOrderId(order.getOrderId());
247   - if(OrderDetailPark != null && StringKit.isNotBlank(OrderDetailPark.getRecordId())){
248   - /**调用青岛路侧费用查询接口.*/
249   - reultMap =iRainQueryService.queryBillRoadside(OrderDetailPark.getRecordId());
250   - }
251   -
252   - }
253   - }
254   - return reultMap;
255   - }
  236 + public Map<String, String> chosseBillQuery(String carNum, Order order) {
  237 + OrderService orderService = Duang.duang(OrderService.class);
  238 + IRainQueryService iRainQueryService = Duang.duang(IRainQueryService.class);
  239 + Map<String, String> reultMap = new HashMap<String, String>();
  240 + if (order != null && StringKit.isNotBlank(order.getOrderId())) {
  241 + logger.info("查询费用来源=" + (order.getSourceType() == 2 ? "调用青岛路侧费用查询接口" : "调用艾润查询费用接口"));
  242 + if ("1".equals(String.valueOf(order.getSourceType()))) {//道闸:调用艾润查询费用接口
  243 + /**调用艾润查询费用接口.*/
  244 + reultMap = iRainQueryService.billQuery(carNum, order.getParkId());
  245 + } else if ("2".equals(String.valueOf(order.getSourceType()))
  246 + && StringKit.isNotBlank(order.getOrderId())) {//调用青岛路侧查询费用接口
  247 + /**查询停车记录id.*/
  248 + OrderDetailPark OrderDetailPark = orderService.queryDetailParkByOrderId(order.getOrderId());
  249 + if (OrderDetailPark != null && StringKit.isNotBlank(OrderDetailPark.getRecordId())) {
  250 + /**调用青岛路侧费用查询接口.*/
  251 + reultMap = iRainQueryService.queryBillRoadside(OrderDetailPark.getRecordId());
  252 + }
256 253  
257   -
  254 + }
  255 + }
  256 + return reultMap;
  257 + }
258 258  
259 259 /**
260 260 * 通过车牌查询待核算支付单信息.<br/>
... ... @@ -273,12 +273,10 @@ public class OrderService {
273 273 sql.append(" order by a.create_date DESC");
274 274  
275 275 Order order = new Order().findFirst(sql.toString(), carNum);
276   -
277   -
278 276  
279 277 return order;
280 278 }
281   -
  279 +
282 280 /**
283 281 * 通过车牌查询待核算支付单信息.<br/>
284 282 *
... ... @@ -297,5 +295,4 @@ public class OrderService {
297 295 return order;
298 296 }
299 297  
300   -
301 298 }
... ...