分润导出

src/main/java/com/thinkgem/jeesite/common/persistence/DataEntity.java

@@ -5,6 +5,7 @@ package com.thinkgem.jeesite.common.persistence;
 
 import java.util.Date;
 
+import com.thinkgem.jeesite.common.utils.excel.annotation.ExcelField;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.Length;
 

src/main/java/com/thinkgem/jeesite/modules/youka/entity/OrderEntity.java

@@ -85,7 +85,7 @@ public class OrderEntity extends DataEntity<OrderEntity> implements Serializable
     public void setPayChannel(String payChannel) {
         this.payChannel = payChannel;
     }
-    @ExcelField(title="支付状态", align=2, sort=50)
+    @ExcelField(title="支付状态", align=2, sort=50, dictType = "pay_status")
     public String getPayStatus() {
         return payStatus;
     }
@@ -150,7 +150,7 @@ public class OrderEntity extends DataEntity<OrderEntity> implements Serializable
     public void setPayMethod(String payMethod) {
         this.payMethod = payMethod;
     }
-    @ExcelField(title="支付方式", align=2, sort=40)
+    @ExcelField(title="支付方式", align=2, sort=40 )
     public String getPayMethodName() {
         return payMethodName;
     }

src/main/java/com/thinkgem/jeesite/modules/youka/entity/YoukaBenefit.java

 package com.thinkgem.jeesite.modules.youka.entity;
 
 import com.thinkgem.jeesite.common.persistence.DataEntity;
+import com.thinkgem.jeesite.common.utils.excel.annotation.ExcelField;
 
 import java.util.Date;
 
@@ -10,6 +11,7 @@ public class YoukaBenefit  extends DataEntity<YoukaBenefit> {
     private String payChannel; // 来源渠道
     private String payMethod;
     private String benefitStatus; // 分润状态 0不可提现 1可以提现
+
     private String benefitType; // 分润类型 A收益 M提现
     private String amount; // 金额
     private String cardCode; // 提现卡code
@@ -18,6 +20,8 @@ public class YoukaBenefit  extends DataEntity<YoukaBenefit> {
 
     private Date endTime;
 
+    private Date createDate;
+
     private OrderEntity orderEntity;
 
     private String code;
@@ -36,7 +40,13 @@ public class YoukaBenefit  extends DataEntity<YoukaBenefit> {
     }
 
 
-
+    @ExcelField(title="时间" ,align=2, sort=50)
+    public Date getCreateDate(){
+        return createDate;
+    }
+    public void setCreateDate(Date createDate){
+        this.createDate= createDate;
+    }
     public String getUserCode() {
         return userCode;
     }
@@ -68,7 +78,7 @@ public class YoukaBenefit  extends DataEntity<YoukaBenefit> {
     public void setBenefitStatus(String benefitStatus) {
         this.benefitStatus = benefitStatus;
     }
-
+    @ExcelField(title="分润类型", align=2, sort=30 ,dictType = "benefit_type")
     public String getBenefitType() {
         return benefitType;
     }
@@ -76,7 +86,7 @@ public class YoukaBenefit  extends DataEntity<YoukaBenefit> {
     public void setBenefitType(String benefitType) {
         this.benefitType = benefitType;
     }
-
+    @ExcelField(title="支出金额", align=2, sort=35)
     public String getAmount() {
         return amount;
     }
@@ -108,7 +118,7 @@ public class YoukaBenefit  extends DataEntity<YoukaBenefit> {
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
-
+    @ExcelField(title="订单号",value = "orderEntity.payCode" ,align=2, sort=45)
     public OrderEntity getOrderEntity() {
         return orderEntity;
     }
@@ -149,7 +159,7 @@ public class YoukaBenefit  extends DataEntity<YoukaBenefit> {
     public void setPayMethod(String payMethod) {
         this.payMethod = payMethod;
     }
-
+    @ExcelField(title="用户名", align=2, sort=20)
     public String getNickname() {
         return nickname;
     }
@@ -157,7 +167,7 @@ public class YoukaBenefit  extends DataEntity<YoukaBenefit> {
     public void setNickname(String nickname) {
         this.nickname = nickname;
     }
-
+    @ExcelField(title="手机号", align=2, sort=25)
     public String getMobile() {
         return mobile;
     }
@@ -165,7 +175,7 @@ public class YoukaBenefit  extends DataEntity<YoukaBenefit> {
     public void setMobile(String mobile) {
         this.mobile = mobile;
     }
-
+    @ExcelField(title="金额", align=2, sort=40)
     public String getBalance() {
         return balance;
     }

src/main/java/com/thinkgem/jeesite/modules/youka/web/YoukaBenefitController.java

 package com.thinkgem.jeesite.modules.youka.web;
 
 import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.utils.DateUtils;
+import com.thinkgem.jeesite.common.utils.excel.ExportExcel;
 import com.thinkgem.jeesite.common.web.BaseController;
 import com.thinkgem.jeesite.modules.youka.entity.OrderEntity;
 import com.thinkgem.jeesite.modules.youka.entity.YoukaBenefit;
@@ -10,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -57,4 +61,25 @@ public class YoukaBenefitController extends BaseController {
         return "modules/youka/benefit/benefitList";
     }
 
+    /**
+     * 导出分润数据
+     * @param youkaBenefit
+     * @param request
+     * @param response
+     * @param redirectAttributes
+     * @return
+     */
+    @RequiresPermissions("youka:benefit:view")
+    @RequestMapping(value = "export", method= RequestMethod.POST)
+    public String exportFile(YoukaBenefit youkaBenefit, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes){
+        try {
+            String fileName = "分润数据" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+            Page<YoukaBenefit> page =youkaBenefitService.findPage(new Page<YoukaBenefit>(request, response, -1),youkaBenefit);
+            new ExportExcel("分润数据", YoukaBenefit.class).setDataList(page.getList()).write(response, fileName).dispose();
+            return null;
+        }catch (Exception e){
+            addMessage(redirectAttributes, "导出分润数据失败！失败信息："+e.getMessage());
+        }
+        return "redirect:"+ adminPath +"/benefit/list?repage";
+    }
 }

src/main/webapp/WEB-INF/views/modules/youka/benefit/benefitList.jsp

@@ -7,7 +7,18 @@
 	<script type="text/javascript">
 		$(document).ready(function() {
 
+            $("#btnExport").click(function(){
+                top.$.jBox.confirm("确认要导出分润数据吗？","系统提示",function(v,h,f){
+                    if(v=="ok"){
+                        $("#searchForm").attr("action","${ctx}/youka/benefit/export");
+                        $("#searchForm").submit();
+                    }
+                },{buttonsFocus:1});
+                top.$('.jbox-body .jbox-icon').css('top','55px');
+            });
         });
+
+
 			<%--$("#btnExport").click(function(){--%>
 				<%--top.$.jBox.confirm("确认要导出订单数据吗？","系统提示",function(v,h,f){--%>
 					<%--if(v=="ok"){--%>

src/main/webapp/WEB-INF/views/modules/youka/order/orderList.jsp

@@ -111,7 +111,8 @@
 				</select>
 			</li>
 			<li><label>交易状态：</label>
-				<form:select path="payStatus" cssStyle="width: 100px">
+				<form:select id="payStatus" path="payStatus" class="input-medium"><form:option value="" label=""/><form:options itemValue="value" itemLabel="label" items="${fns:getDictList('pay_status')}" htmlEscape="false"/></form:select>
+				<%--<form:select path="payStatus" cssStyle="width: 100px">
 					<form:option value="">
 						全部状态
 					</form:option>
@@ -131,6 +132,7 @@
 						支付失败
 					</form:option>
 				</form:select>
+				--%>
 			</li>
 
 			<li class="btns"><input id="btnSubmit" class="btn btn-primary" type="submit" value="查询" onclick="return page();"/>