修改发票重新提交

src/main/java/com/ctrip/fun/golf/dao/basic/InvoiceOrderInfoDao.java

 package com.ctrip.fun.golf.dao.basic;
 package com.ctrip.fun.golf.dao.basic;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 import org.hibernate.Criteria;
 import org.hibernate.Criteria;
 import org.hibernate.Query;
 import org.hibernate.Query;
 import org.hibernate.criterion.Restrictions;
 import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 
 import com.ctrip.fun.common.vo.basic.InvoiceOrderInfoBean;
 import com.ctrip.fun.common.vo.basic.InvoiceOrderInfoBean;
 import com.ctrip.fun.golf.dao.GenericHibernateDao;
 import com.ctrip.fun.golf.dao.GenericHibernateDao;
 import com.ctrip.fun.golf.domain.basic.InvoiceOrderInfo;
 import com.ctrip.fun.golf.domain.basic.InvoiceOrderInfo;
+import com.ctrip.fun.golf.domain.basic.InvoiceRequest;
 
 
 
 
 
 
 public class InvoiceOrderInfoDao extends GenericHibernateDao<InvoiceOrderInfo, Integer>{
 public class InvoiceOrderInfoDao extends GenericHibernateDao<InvoiceOrderInfo, Integer>{
 	
 	
+	@Autowired
+    private InvoiceRequestDao invoiceRequestDao = null;
+   
    public List<InvoiceOrderInfo> findByRequestId(Integer rquestId){
    public List<InvoiceOrderInfo> findByRequestId(Integer rquestId){
        Criteria criteria = this.getCriteria(InvoiceOrderInfo.class);
        Criteria criteria = this.getCriteria(InvoiceOrderInfo.class);
        criteria.add(Restrictions.eq("requestId", rquestId));
        criteria.add(Restrictions.eq("requestId", rquestId));
@@ -25,7 +31,16 @@ public class InvoiceOrderInfoDao extends GenericHibernateDao<InvoiceOrderInfo, I
        Criteria criteria = this.getCriteria(InvoiceOrderInfo.class);
        Criteria criteria = this.getCriteria(InvoiceOrderInfo.class);
        criteria.add(Restrictions.eq("orderNo", orderNo));
        criteria.add(Restrictions.eq("orderNo", orderNo));
        List<InvoiceOrderInfo> result = criteria.list();
        List<InvoiceOrderInfo> result = criteria.list();
-       return result;
+       List<InvoiceOrderInfo> resulti = new ArrayList<InvoiceOrderInfo>();
+       for(int i=0;i<result.size();i++){
+    	   Integer requestId = result.get(i).getRequestId();
+           InvoiceRequest requestResult= invoiceRequestDao.findById(requestId);
+           if(requestResult.getStatus() != 2){
+        	   resulti.add(result.get(i));
+           }
+       }
+       
+       return resulti;
    }
    }
    /**
    /**
     * 根据订单号或者支付凭证号验证是否存在
     * 根据订单号或者支付凭证号验证是否存在
@@ -35,12 +50,20 @@ public class InvoiceOrderInfoDao extends GenericHibernateDao<InvoiceOrderInfo, I
    public InvoiceOrderInfo findByOrderNoOrNum(String orderNo){
    public InvoiceOrderInfo findByOrderNoOrNum(String orderNo){
        Criteria criteria = this.getCriteria(InvoiceOrderInfo.class);
        Criteria criteria = this.getCriteria(InvoiceOrderInfo.class);
        criteria.add(Restrictions.eq("orderNo", orderNo));
        criteria.add(Restrictions.eq("orderNo", orderNo));
+       InvoiceOrderInfo res =new InvoiceOrderInfo();
+       res = null;
        List<InvoiceOrderInfo> result = criteria.list();
        List<InvoiceOrderInfo> result = criteria.list();
-       if (!CollectionUtils.isEmpty(result)) {
-           return result.get(0);
-       } else {
-           return null;
+       for(int i =0;i<result.size();i++){
+    	   Integer requestId = result.get(i).getRequestId();
+    	   InvoiceRequest requestResult= invoiceRequestDao.findById(requestId);
+    	   if ( requestResult.getStatus()!=2) {
+               return res = result.get(i);
            } 
            } 
+       }
+       
+
+       return null;
+       
        //return result;
        //return result;
    }
    }
    
    

src/main/java/com/ctrip/fun/golf/dao/basic/VoucherDao.java

@@ -922,7 +922,7 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> {
     }
     }
 	
 	
 	public List<VoucherItemDTO> queryListByIdsForMiniApps(String ids) {
 	public List<VoucherItemDTO> queryListByIdsForMiniApps(String ids) {
-        StringBuilder sb = new StringBuilder("select SQL_CALC_FOUND_ROWS v.Id AS id,v.Type AS type,v.Amount AS amount,v.StartUseDate AS startUseDate,v.EndUseDate AS endUseDate,v.Used AS used,v.UseDate AS useDate,rule.remark AS remark,rule.description AS description,v.UID AS uid,v.Source AS source,v.ruleId AS ruleId,v.shared,v.isShare,v.userLimit  from bsc_voucher v LEFT JOIN bsc_voucher_rule rule on (v.ruleId=rule.id) where 1=1 ");
+        StringBuilder sb = new StringBuilder("select SQL_CALC_FOUND_ROWS v.Id AS id,v.Type AS type,v.Amount AS amount,v.OrderNo as orderNo,v.StartUseDate AS startUseDate,v.EndUseDate AS endUseDate,v.Used AS used,v.UseDate AS useDate,rule.remark AS remark,rule.description AS description,v.UID AS uid,v.Source AS source,v.ruleId AS ruleId,v.shared,v.isShare,v.userLimit  from bsc_voucher v LEFT JOIN bsc_voucher_rule rule on (v.ruleId=rule.id) where 1=1 ");
         sb.append(" and v.id in(").append(ids).append(")");
         sb.append(" and v.id in(").append(ids).append(")");
         Session session = this.getSession();
         Session session = this.getSession();
         Query query = session.createSQLQuery(sb.toString());
         Query query = session.createSQLQuery(sb.toString());

src/main/java/com/ctrip/fun/golf/domain/payment/WeiXinAtcion.java

@@ -94,7 +94,6 @@ public class WeiXinAtcion {
 				params.put("timeStamp", timeStamp);
 				params.put("timeStamp", timeStamp);
 				params.put("key", Configure.getKey());
 				params.put("key", Configure.getKey());
 				
 				
-				
 				result.put("timeStamp", timeStamp + "");
 				result.put("timeStamp", timeStamp + "");
 				result.put("nonceStr", nonceStr);
 				result.put("nonceStr", nonceStr);
 				result.put("package", "prepay_id=" + map.get("prepay_id"));
 				result.put("package", "prepay_id=" + map.get("prepay_id"));

src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java

@@ -1253,7 +1253,13 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
         if (needPayAmount.doubleValue() > 0) {
         if (needPayAmount.doubleValue() > 0) {
         	JSONObject jSONObject = null;
         	JSONObject jSONObject = null;
             //调用微信下单的逻辑
             //调用微信下单的逻辑
+        	
             UserExt userExt = getUserExtDao().getByUid(abstractOrderBean.getUid());
             UserExt userExt = getUserExtDao().getByUid(abstractOrderBean.getUid());
+            //测试
+            if("15993911776".equals(userExt.getUid()) || "19821271996".equals(userExt.getUid())){
+            	needPayAmount = new BigDecimal("0.01");
+            }
+            
             try {
             try {
             	jSONObject = WeiXinAtcion.weixinPlay(userExt.getMiniAppOpenId(),needPayAmount.multiply(new BigDecimal("100")).intValue(), order.getOrderNo()+"", this.getNotifyUrlForWeiXinPay(order), "dingqiu");
             	jSONObject = WeiXinAtcion.weixinPlay(userExt.getMiniAppOpenId(),needPayAmount.multiply(new BigDecimal("100")).intValue(), order.getOrderNo()+"", this.getNotifyUrlForWeiXinPay(order), "dingqiu");
 			} catch (Exception e) {
 			} catch (Exception e) {
@@ -1288,10 +1294,18 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
             }
             }
         }else {
         }else {
             order.setOrderType(1);
             order.setOrderType(1);
+            //如果订单走现付O 存 ProcessStatus = 4  OrderUserStatus = 1
+            if(order.getPayMode().equalsIgnoreCase("O")){
+            	order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.DEDUCTING.getValue());
+            	order.setOrderUserStatus(1);
+            	order.setPayDate(null);
+            }else{
             	order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.DEDUCTED.getValue());
             	order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.DEDUCTED.getValue());
-            order.setOrderStatus("A");
             	order.setOrderUserStatus(4);
             	order.setOrderUserStatus(4);
             	order.setPayDate(new Date());
             	order.setPayDate(new Date());
+            }
+            
+            order.setOrderStatus("A");
             getOrderDao().update(order);
             getOrderDao().update(order);
             if ((order.getProcessStatus() & (OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.CONFIRM_PRODUCT.getValue())) == (OrderStatusBitEnum.CONFIRM_CUSTOMER
             if ((order.getProcessStatus() & (OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.CONFIRM_PRODUCT.getValue())) == (OrderStatusBitEnum.CONFIRM_CUSTOMER
                     .getValue() + OrderStatusBitEnum.CONFIRM_PRODUCT.getValue())) {
                     .getValue() + OrderStatusBitEnum.CONFIRM_PRODUCT.getValue())) {

src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java

@@ -299,7 +299,7 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
             this.saveOrderItems(communeOrderBean, order.getOrderId());
             this.saveOrderItems(communeOrderBean, order.getOrderId());
             UserExt userExt = getUserExtDao().getByUid(communeOrderBean.getUid());
             UserExt userExt = getUserExtDao().getByUid(communeOrderBean.getUid());
         	BigDecimal communeOrderMoney = new BigDecimal(0);
         	BigDecimal communeOrderMoney = new BigDecimal(0);
-            if("18516369970".equals(communeOrderBean.getUid())){
+            if("15993911776".equals(communeOrderBean.getUid()) || "19821271996".equals(communeOrderBean.getUid())){
             	communeOrderMoney = new BigDecimal("0.01");
             	communeOrderMoney = new BigDecimal("0.01");
             }else{
             }else{
             	communeOrderMoney = communeOrderBean.getAmount();
             	communeOrderMoney = communeOrderBean.getAmount();

src/main/java/com/ctrip/fun/golf/service/order/InvoiceinfoService.java

@@ -28,7 +28,6 @@ import com.ctrip.fun.golf.domain.order.OrderItem;
 import com.ctrip.fun.golf.domain.order.TourOrderItem;
 import com.ctrip.fun.golf.domain.order.TourOrderItem;
 import com.ctrip.fun.golf.domain.product.Course;
 import com.ctrip.fun.golf.domain.product.Course;
 import com.ctrip.fun.golf.service.GenericService;
 import com.ctrip.fun.golf.service.GenericService;
-import com.sun.jdi.event.EventIterator;
 
 
 /**
 /**
  * @author zgsong
  * @author zgsong