Parcourir la source

订单中心开发

wangxiaoming il y a 6 ans
Parent
commit
e0a1cdad29

+ 39 - 0
wateroPF-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PlaceInfo.java

@@ -74,6 +74,11 @@ public class PlaceInfo implements java.io.Serializable {
     private int salesVolumes;               //销售数量
     private int allReback;                 //总提成
 
+    private Integer allAmount;  //应该返利总金额
+    private Integer cancelAmount;  //取消返利总金额
+    private Integer proposedAmount;  //提出金额
+    private Integer rebateAllAmount;  //待返利金额
+
     public String getQrcodeUrl() {
         return qrcodeUrl;
     }
@@ -347,6 +352,40 @@ public class PlaceInfo implements java.io.Serializable {
         this.allReback = allReback;
     }
 
+    public Integer getAllAmount() {
+        return allAmount;
+    }
+
+    public void setAllAmount(Integer allAmount) {
+        this.allAmount = allAmount;
+    }
+
+    public Integer getCancelAmount() {
+        return cancelAmount;
+    }
+
+    public void setCancelAmount(Integer cancelAmount) {
+        this.cancelAmount = cancelAmount;
+    }
+
+    public Integer getProposedAmount() {
+        return proposedAmount;
+    }
+
+    public void setProposedAmount(Integer proposedAmount) {
+        this.proposedAmount = proposedAmount;
+    }
+
+
+
+    public Integer getRebateAllAmount() {
+        return rebateAllAmount;
+    }
+
+    public void setRebateAllAmount(Integer rebateAllAmount) {
+        this.rebateAllAmount = rebateAllAmount;
+    }
+
     @Override
     public String toString() {
         return "PlaceInfo [id=" + id + ", supperId=" + supperId

+ 3 - 0
wateroPF-wechat-interface/src/main/java/com/iamberry/wechat/face/drp/PlaceWithDrawalsLogsService.java

@@ -52,4 +52,7 @@ public interface PlaceWithDrawalsLogsService {
 	
 	//获取所有的提现记录  可支持条件查询
 	public List<PlaceWithDrawalsLogs> selectAllMore(PlaceWithDrawalsLogs placeWithDrawalsLogs);
+
+	//获取所有的提现的钱
+	public Integer selectAllMoney(PlaceWithDrawalsLogs placeWithDrawalsLogs);
 }

+ 5 - 0
wateroPF-wechat-interface/src/main/java/com/iamberry/wechat/face/reback/RebackServices.java

@@ -106,4 +106,9 @@ public interface RebackServices {
 	 * 获取总提成
 	 */
 	public int getAllReback(RebackInfo rebackInfo);
+
+	/**
+	 * 获取取消返利
+	 */
+	public int getAllRebackByStatus(RebackInfo rebackInfo);
 }

+ 1 - 0
wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/drp/PlaceInfoServiceImpl.java

@@ -201,6 +201,7 @@ public class PlaceInfoServiceImpl implements PlaceInfoService {
 	 * 分销商-商户信息管理列表查询
 	 * @return
 	 */
+	@Override
 	public List getPlaceInfoList(PlaceInfo placeInfo){
 		placeInfo.getPage().initRecordBegin();
 		List<PlaceInfo> lists=placeInfoMapper.selectAll(placeInfo);

+ 4 - 0
wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/drp/PlaceWithDrawalsLogsServiceImpl.java

@@ -348,4 +348,8 @@ public class PlaceWithDrawalsLogsServiceImpl implements
 		// TODO Auto-generated method stub
 		return placeWithDrawalsLogsMapper.selectAllMore(placeWithDrawalsLogs);
 	}
+	@Override
+	public Integer selectAllMoney(PlaceWithDrawalsLogs placeWithDrawalsLogs){
+		return placeWithDrawalsLogsMapper.selectAllMoney(placeWithDrawalsLogs);
+	}
 }

+ 4 - 0
wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/PlaceWithDrawalsLogsMapper.java

@@ -39,4 +39,8 @@ public interface PlaceWithDrawalsLogsMapper {
 		 */
 		public int getTotalMoneyByPlaceId(int placeId);
 
+
+	//获取所有的提现的钱
+	public Integer selectAllMoney(PlaceWithDrawalsLogs placeWithDrawalsLogs);
+
 }

+ 5 - 0
wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/RebackInfoMapper.java

@@ -151,4 +151,9 @@ public interface RebackInfoMapper {
 	 * 获取总提成
 	 */
 	public int getAllReback(RebackInfo rebackInfo);
+
+	/**
+	 * 获取取消返利
+	 */
+	public int getAllRebackByStatus(RebackInfo rebackInfo);
 }

+ 11 - 0
wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/placeWithDrawalsLogsMapper.xml

@@ -197,4 +197,15 @@
  		where PLACE_WITHDRAWALS_PLACE_ID = #{id} and PLACE_STATUS =2
   </select>
 
+	<select id="selectAllMoney" parameterType="PlaceWithDrawalsLogs" resultType="Integer">
+		SELECT
+			IFNULL(sum(PLACE_WITHDRAWALS_NUM),0) toTalMoney
+		FROM
+			tb_iamberry_place_withdrawals_logs
+		WHERE
+			PLACE_WITHDRAWALS_PLACE_ID = #{placeId}
+		and PLACE_STATUS = #{status}
+	</select>
+
+
 </mapper>

+ 11 - 1
wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/rebackInfoMapper.xml

@@ -721,5 +721,15 @@ m left join tb_iamberry_place_info b on b.place_openid=m.reback_to_openid
 		AND reback_status in (1,2)
 	</select>
 
+	<!-- 获取取消返利-->
+	<select id="getAllRebackByStatus" parameterType="RebackInfo" resultType="integer">
+		SELECT
+		ifnull(SUM(t.reback_money),0)
+		FROM
+		tb_iamberry_reback t
+		WHERE t.reback_user_id = #{userId}
+		AND reback_status = #{status}
+	</select>
+
 
- </mapper>
+</mapper>

+ 7 - 0
wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/reback/RebackServicesImpl.java

@@ -474,4 +474,11 @@ public class RebackServicesImpl implements RebackServices {
 		return rebackInfoMapper.getAllReback(rebackInfo);
 	}
 
+	/**
+	 * 获取取消返利
+	 */
+	public int getAllRebackByStatus(RebackInfo rebackInfo){
+		return rebackInfoMapper.getAllRebackByStatus(rebackInfo);
+	}
+
 }

+ 0 - 1
wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/reback/RebackStaticServiceImpl.java

@@ -880,5 +880,4 @@ public class RebackStaticServiceImpl implements RebackStaticService {
 		double getRebatemount  = rebackInfoMapper.getRebatemount(map);
 		return getRebatemount;
 	}
-
 }

+ 100 - 0
wateroPF-wechat-web/src/main/java/com/iamberry/wechat/handles/drp/AdminWithDrp.java

@@ -9,6 +9,7 @@ import com.iamberry.wechat.core.entity.banner.MessageDTO;
 import com.iamberry.wechat.core.entity.drp.*;
 import com.iamberry.wechat.core.entity.flow.TemplateInfo;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.reback.RebackInfo;
 import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.drp.DrpRoleInfoService;
 import com.iamberry.wechat.face.drp.PlaceInfoService;
@@ -18,7 +19,9 @@ import com.iamberry.wechat.face.flow.TemplateInfoService;
 import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.face.order.AdminOrderService;
 import com.iamberry.wechat.face.qrcode.QrcodeService;
+import com.iamberry.wechat.face.reback.RebackServices;
 import com.iamberry.wechat.face.reback.RebackStaticService;
+import com.iamberry.wechat.service.reback.RebackStaticServiceImpl;
 import com.iamberry.wechat.service.wechat.WeChatServiceImpl;
 import com.iamberry.wechat.tools.*;
 import jxl.Sheet;
@@ -47,6 +50,7 @@ import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -72,6 +76,8 @@ public class AdminWithDrp {
     @Autowired
     private RebackStaticService rebackStaticService;
     @Autowired
+    private RebackServices rebackServices;
+    @Autowired
     private QrcodeService qrcodeService;
     @Autowired
     private DrpRoleInfoService drpRoleInfoService;
@@ -554,6 +560,100 @@ public class AdminWithDrp {
 
 
     /**
+     * 下载导出返利
+     */
+    @ResponseBody
+    @RequestMapping(value = "/downloadRe")
+    public ModelAndView downloadRe(HttpServletRequest request){
+        PlaceInfo pinfo = new PlaceInfo();
+        PageBean pageBean = new PageBean();
+        pageBean.setPageSize(1000000);
+        pageBean.setPageNumber(1);
+        pinfo.setPage(pageBean);
+        List<PlaceInfo> list = placeInfoService.getPlaceInfoList(pinfo);
+
+        for (PlaceInfo pi : list){
+            RebackInfo rebackInfo = new RebackInfo();
+
+            RebackInfo ri1 = new RebackInfo();
+            ri1.setUserId(pi.getId());
+            ri1.setStatus(1);
+            int rebateAmount = rebackServices.getAllRebackByStatus(ri1);
+            pi.setRebateAllAmount(rebateAmount);
+
+            rebackInfo.setUserId(pi.getId());
+            rebackInfo.setStatus(2);
+            int allAmount = rebackServices.getAllRebackByStatus(rebackInfo);
+            pi.setAllAmount(allAmount);
+
+            RebackInfo ri = new RebackInfo();
+            ri.setUserId(pi.getId());
+            ri.setStatus(3);
+            int cancelAmount = rebackServices.getAllRebackByStatus(ri);
+            pi.setCancelAmount(cancelAmount);
+
+            PlaceWithDrawalsLogs placeWithDrawalsLogs = new PlaceWithDrawalsLogs();
+            placeWithDrawalsLogs.setPlaceId(pi.getId());
+            placeWithDrawalsLogs.setStatus(2);
+            int proposedAmount = placeWithDrawalsLogsService.selectAllMoney(placeWithDrawalsLogs);
+            pi.setProposedAmount(proposedAmount);
+        }
+
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        // 准备model
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("fileName", "上海WaterOPF分销");	// 下载文件名称
+        // 标题
+        List<String> titles = new ArrayList<String>();
+        titles.add("商户ID");
+        titles.add("商户名称");
+        titles.add("真实姓名");
+        titles.add("金额(元)");
+        titles.add("待返利金额(元)");
+        titles.add("记录-待返利金额(元)");
+        titles.add("记录-已返利总返利(元)");
+        titles.add("记录-取消返利(元)");
+        titles.add("已提出金额(元)");
+        titles.add("角色");
+        titles.add("下线用户");
+        titles.add("是否激活");
+        titles.add("联系方式");
+        titles.add("激活码");
+        titles.add("创建时间");
+
+        model.put("titles", titles);
+        List<List<Object>> countexts = new ArrayList<List<Object>>();
+        for (PlaceInfo info : list) {
+            List<Object> row = new ArrayList<Object>();
+            row.add(info.getId());
+            row.add(info.getName() == null ?"":info.getName());
+            row.add(info.getUserName() == null ?"":info.getName());
+            row.add("".equals(info.getAmount() + "")?"0":info.getAmount()/100);
+            row.add("".equals(info.getRebatePending() + "")?"0":info.getRebatePending()/100);
+
+            row.add("".equals(info.getRebateAllAmount() + "")?"0":info.getRebateAllAmount()/100);
+            row.add("".equals(info.getAllAmount() + "")?"0":info.getAllAmount()/100);
+            row.add("".equals(info.getCancelAmount() + "")?"0":info.getCancelAmount()/100);
+            row.add("".equals(info.getProposedAmount() + "")?"0":info.getProposedAmount()/100);
+
+            row.add(info.getRoleName() == null?"":info.getRoleName());
+            row.add("".equals(info.getOfflineubscriber() + "")?"0":info.getOfflineubscriber());
+            row.add( info.getOpenid() == null||"".equals(info.getOpenid())?"0":info.getOpenid());
+            row.add(info.getTel() == null?"":info.getTel());
+            row.add(info.getInitCode() == null?"":info.getInitCode());
+            row.add(info.getCreateDate() == null?"": formatter.format(info.getCreateDate()));
+            countexts.add(row);
+        }
+        model.put("varList", countexts);
+
+        ObjectExcelView erv = new ObjectExcelView();
+        ModelAndView mv = new ModelAndView(erv, model);
+        return mv;
+    }
+
+
+    /**
      * 后台-Drp分销管理主界面 --> 获取公司分销员的下线列表
      *
      * @param pageNO

+ 6 - 0
wateroPF-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/placeInfolist.jsp

@@ -45,6 +45,8 @@
 		<button name="" id="submitBtn" onclick="return dataCheck();" class="btn btn-success radius" type="submit">
 			<i class="Hui-iconfont"></i> 搜索
 		</button>
+
+		<%--<div onclick="return download();">下载订单</div>--%>
 	</form>
 	<form id="goodsform" >
 		<div class="cl pd-5 bg-1 bk-gray mt-20">
@@ -383,6 +385,10 @@ function downLoadList() {
 	 
 }
 
+function  download() {
+    window.location="/wateroPF/admin/drp/downloadRe";
+}
+
 /**
  * 用于刷新页面
  */