支付回调修改

web/src/main/java/com/jpsoft/bus/modules/pay/alipay/AlipayController.java

@@ -94,6 +94,18 @@ public class AlipayController {
                 mergeOrderInfo.setUpdateTime(new Date());
                 mergeOrderInfoService.update(mergeOrderInfo);
 
+                //同一个班次下的其他未支付删除
+                List<MergeOrderInfo> mergeOrderInfoList = mergeOrderInfoService.findByOpenIdShiftIdPayStatus(mergeOrderInfo.getOpenId(),mergeOrderInfo.getVehicleShiftId(),10);
+                if (mergeOrderInfoList.size()>0){
+                    for (MergeOrderInfo mergeOrderInfo1 : mergeOrderInfoList){
+                        if (!mergeOrderInfo1.getId().equals(mergeOrderInfo.getId())){
+                            mergeOrderInfo1.setDelFlag(true);
+                            mergeOrderInfoService.update(mergeOrderInfo1);
+                        }
+
+                    }
+                }
+
                 List<OrderInfo> orderInfoList = orderInfoService.findByMergeOrderId(mergeOrderInfo.getId());
 
                 if (orderInfoList.size()>0){

web/src/main/java/com/jpsoft/bus/modules/pay/wechat/WxPayController.java

@@ -181,6 +181,18 @@ public class WxPayController {
                     mergeOrderInfo.setUpdateTime(new Date());
                     mergeOrderInfoService.update(mergeOrderInfo);
 
+                    //同一个班次下的其他未支付删除
+                    List<MergeOrderInfo> mergeOrderInfoList = mergeOrderInfoService.findByOpenIdShiftIdPayStatus(mergeOrderInfo.getOpenId(),mergeOrderInfo.getVehicleShiftId(),10);
+                    if (mergeOrderInfoList.size()>0){
+                        for (MergeOrderInfo mergeOrderInfo1 : mergeOrderInfoList){
+                            if (!mergeOrderInfo1.getId().equals(mergeOrderInfo.getId())){
+                                mergeOrderInfo1.setDelFlag(true);
+                                mergeOrderInfoService.update(mergeOrderInfo1);
+                            }
+
+                        }
+                    }
+
                     List<OrderInfo> orderInfoList = orderInfoService.findByMergeOrderId(mergeOrderInfo.getId());
 
                     if (orderInfoList.size()>0){