无效退款

src/main/java/com/ssj/dao/weixin/adminsale/dao/impl/AdminSaleQueryDaoImpl.java

@@ -302,9 +302,10 @@ public class AdminSaleQueryDaoImpl implements AdminSaleQueryDao {
     public Page<Map<String, Object>> getMealOrder(Map<String, Object> params, Pageable initPage) {
         StringBuilder selSQL = new StringBuilder();
         List<Object> queryParams = new ArrayList<Object>();
-        selSQL.append("SELECT min(t11.sign_time) as sign_time,max(t11.end_sign_time) as end_sign_time,t.buy_month,t.price,t.lib_service,count(1) as tf_count,t.id,t.order_no,t13.lib_id \n");
-        selSQL.append("FRom fx_merchant_meal_order t \n");
+        selSQL.append("SELECT min(t11.sign_time) as sign_time,max(t11.end_sign_time) as end_sign_time,t.buy_month,t.price,t.lib_service,count(1) as tf_count,t.id,t.order_no,t13.lib_id,t14.id as refund_id,t14.audit_point,t14.audit_state \n");
+        selSQL.append("from fx_merchant_meal_order t \n");
         selSQL.append("left join fx_merchant_meal t11 on t.id = t11.order_id\n");
+        selSQL.append("left join fx_merchant_refund t14 on t.id = t14.meal_order_id\n");
         selSQL.append("left join fx_merchant t13 on t.merchant_id = t13.id\n");
         selSQL.append("left join tb_orders t12 on t.order_no = t12.order_no\n");
         selSQL.append("where  TO_DAYS(t11.end_sign_time) >TO_DAYS(NOW())\n");

src/main/java/com/ssj/refund/bean/RefundInfo.java

@@ -5,6 +5,7 @@ import com.ssj.bean.common.framework.core.domain.BaseEntity;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author sh
@@ -71,6 +72,8 @@ public class RefundInfo extends BaseEntity {
      */
     private String userId;
 
+    private Date createTime;
+
     public String getOrderNo() {
         return orderNo;
     }
@@ -182,4 +185,12 @@ public class RefundInfo extends BaseEntity {
     public void setUserId(String userId) {
         this.userId = userId;
     }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
 }

src/main/java/com/ssj/service/weixin/adminsale/service/impl/AdminSaleServiceImpl.java

@@ -17,10 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.File;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 @Service
@@ -202,11 +199,12 @@ public class AdminSaleServiceImpl  implements AdminSaleService {
 			info.setOtherReason(otherInput);
 		}
 		info.setVipIds(Arrays.toString(vipIds));
-		//业务审核
-		info.setAuditState(1);
+		//业务审核 1-审核通过 2-审核不通过
+		info.setAuditState(0);
 		info.setAuditPoint("业务审核");
 		info.setStudentCount(vipIds.length);
 		info.setUserId(userId);
+		info.setCreateTime(new Date());
 		//计算单价
 		Map<String,Object> params = new HashMap<>();
 		params.put("id",id);

src/main/java/com/ssj/weixin/interceptor/SetControlDataInterceptor.java

@@ -90,22 +90,22 @@ public class SetControlDataInterceptor extends HandlerInterceptorAdapter {
         String url = request.getServletPath() + (request.getPathInfo() == null ? "" : request.getPathInfo());
         if (checkRequestURIIntNotFilterList(request,url)) { return true; }
 
-//        boolean bool= UserUtil.WeixinOauth2(request,response);//是否从微信浏览器分享进来
-//        if(!bool){
-//     	   return false;
-//        }
-//        User user = UserUtil.getUser(request);
-//        if(!notCheckPhoneList.contains(url)){
-//			if(StringUtils.isEmpty(user.getMobile())){
-//				String sysUrl=SystemResourceLocator.getValue("gz_book_url").toString();
-//				//String sysUrl= "http://localhost:8081/";
-//				response.sendRedirect(sysUrl+"/weixin/mylib/bindingMobilePhone.html?redirectUrl="+(sysUrl+url));
-//				return false;
-//			}
-//        }
-//        // 初始化用户信息<必须>
-//        return checkRequestURIIntNotFilterList(request,response,url);
-        return true;
+        boolean bool= UserUtil.WeixinOauth2(request,response);//是否从微信浏览器分享进来
+        if(!bool){
+     	   return false;
+        }
+        User user = UserUtil.getUser(request);
+        if(!notCheckPhoneList.contains(url)){
+			if(StringUtils.isEmpty(user.getMobile())){
+				String sysUrl=SystemResourceLocator.getValue("gz_book_url").toString();
+				//String sysUrl= "http://localhost:8081/";
+				response.sendRedirect(sysUrl+"/weixin/mylib/bindingMobilePhone.html?redirectUrl="+(sysUrl+url));
+				return false;
+			}
+        }
+        // 初始化用户信息<必须>
+        return checkRequestURIIntNotFilterList(request,response,url);
+//        return true;
     }
     
     //运行Controller后运行

src/main/java/com/ssj/weixin/util/UserUtil.java

@@ -118,8 +118,8 @@ public class UserUtil {
 		HttpSession session = request.getSession();
         User user = (User) session.getAttribute("user");
         if(user==null){
-//        	String openId=(String) session.getAttribute("openId");
-       	String openId="o2VMi1qnP07FMr27dk75AVbeaygU";
+        	String openId=(String) session.getAttribute("openId");
+//       	String openId="o2VMi1qnP07FMr27dk75AVbeaygU";
         	if(openId !=null){
         		UserService userService= SystemResourceLocator.getBean(UserService.class);
         		user=userService.findByAccount(openId);

src/main/resources/templates/weixin/invoice/select_order.html

@@ -44,7 +44,15 @@
 	<p class="txt">剩余月数/购买月数：{{=d.list[i].tf_count}}/{{=d.list[i].buy_month}}</p>
 	<p class="txt">剩余起始月：{{=d.list[i].sign_time}}</p>
 	<p class="txt">剩余终止月：{{=d.list[i].end_sign_time}}</p>
-	<p class="txt buy_fuwu_item_edit">订单总金额：{{=d.list[i].price}} <span class="edit" onclick="editFp('{{=d.list[i].id}}')" >选择<span class="arrow_right"></span></span></p>
+	{{# if(d.list[i].audit_state == 0) { }}
+	<p class="txt buy_fuwu_item_edit">订单金额：{{=d.list[i].price}} <span class="edit" >{{=d.list[i].audit_point}}中</span></p>
+	{{# }else if(d.list[i].audit_state == 1){ }}
+	<p class="txt buy_fuwu_item_edit">订单金额：{{=d.list[i].price}} <span class="edit" >{{=d.list[i].audit_point}}通过</span></p>
+	{{# }else if(d.list[i].audit_state == 2){ }}
+	<p class="txt buy_fuwu_item_edit">订单金额：{{=d.list[i].price}} <span class="edit" >{{=d.list[i].audit_point}}已拒绝</span></p>
+	{{# }else{}}
+	<p class="txt buy_fuwu_item_edit">订单总金额：{{=d.list[i].price}} <span class="edit" onclick="editFp('{{=d.list[i].id}}')" >申请退款<span class="arrow_right"></span></span></p>
+	{{# } }}
 </div>
 {{# } }}
 {{# } }}