提交修改

hai-bweb/src/main/java/com/bweb/controller/HighAgentController.java

@@ -2,12 +2,14 @@ package com.bweb.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hai.common.QRCodeGenerator;
 import com.hai.common.exception.ErrorCode;
 import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
 import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
 import com.hai.common.utils.DateUtil;
+import com.hai.common.utils.IDGenerator;
 import com.hai.common.utils.MemberValidateUtil;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.entity.HighAgent;
@@ -92,8 +94,7 @@ public class HighAgentController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.AGENT_NAME, "");
             }
 
-
+            highAgentModel.setAgentKey(String.valueOf(System.currentTimeMillis()));
-
             highAgentModel.setStatus(1); // 状态：0：不可用，1：可用
             highAgentModel.setCreateTime(new Date());
             highAgentModel.setOperatorId(userInfoModel.getSecUser().getId());
@@ -147,7 +148,7 @@ public class HighAgentController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.AGENT_NAME, "");
             }
 
-
+            highAgentModel.setAgentKey(highAgent.getAgentKey());
             highAgentModel.setStatus(1); // 状态：0：不可用，1：可用
             highAgentModel.setCreateTime(new Date());
             highAgentModel.setOperatorId(userInfoModel.getSecUser().getId());
@@ -162,6 +163,32 @@ public class HighAgentController {
         }
     }
 
+    @RequestMapping(value = "/generateRechargeAgentQrCode", method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "生成【充值代理商】二维码")
+    public ResponseData generateRechargeAgentQrCode(@RequestParam(value = "agentId", required = true) Long agentId) {
+        try {
+
+            HighAgent highAgent = highAgentService.findByAgentMsgId(agentId);
+            // 代理商类型  1：卡券代理商  2：充值代理商
+            if (highAgent == null && highAgent.getType() != 2) {
+                log.error("HighAgentController --> generateRechargeAgentQrCode() error!", "此代理商暂无法生成二维码");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "此代理商暂无法生成二维码");
+            }
+            // 生成二维码
+            String url = "https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=";
+            String qrCodeImg = highAgent.getAgentKey()+".png";
+            String qrCodeUrl = "/home/project/hsg/filesystem/rechargeAgentQrCode/" + qrCodeImg;
+            QRCodeGenerator.generateQRCodeImage(url+highAgent.getAgentKey(), 350, 350, qrCodeUrl);
+            highAgent.setExt1(qrCodeImg);
+            highAgentService.updateAgentDetail(highAgent);
+            return ResponseMsgUtil.success(qrCodeImg);
+        } catch (Exception e) {
+            log.error("HighAgentController --> generateRechargeAgentQrCode() error!", e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
+
     @RequestMapping(value = "/getListAgent", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "查询代理商列表")

hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java

@@ -1,6 +1,10 @@
 package com.bweb.controller;
 
+import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSONObject;
+import com.bweb.config.SysConst;
+import com.bweb.model.ExportHighOrderModel;
+import com.bweb.model.ExportOutRechargeOrder;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hai.common.exception.ErrorCode;
@@ -15,6 +19,8 @@ import com.hai.common.utils.IDGenerator;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.common.utils.WxUtils;
 import com.hai.entity.OutRechargeOrder;
+import com.hai.model.HighOrderModel;
+import com.hai.model.OutRechargeOrderModel;
 import com.hai.model.OrderRefundModel;
 import com.hai.model.ResponseData;
 import com.hai.model.UserInfoModel;
@@ -41,6 +47,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Controller
@@ -174,6 +181,24 @@ public class OutRechargeOrderController {
         }
     }
 
+    @RequestMapping(value = "/exportOrderList", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "导出订单")
+    public ResponseData exportOrderList() {
+        try {
+
+            String name = "/outRechargeOrder/充值订单" + System.currentTimeMillis() + ".xlsx";
+            Map<String,Object> map = new HashMap<>();
+            List<OutRechargeOrderModel> list = outRechargeOrderService.getOrderCount(map);
+            String fileName = SysConst.getSysConfig().getFileUrl() + name;
+            EasyExcel.write(fileName, ExportOutRechargeOrder.class).sheet("商品订单").doWrite(list);
+            return ResponseMsgUtil.success(name);
+
+        } catch (Exception e) {
+            log.error("HighOrderController --> exportOrderList() error!", e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
     @RequestMapping(value = "/orderToRefund", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "订单退款")
@@ -289,4 +314,5 @@ public class OutRechargeOrderController {
             return ResponseMsgUtil.exception(e);
         }
     }
+
 }

hai-bweb/src/main/java/com/bweb/model/ExportOutRechargeOrder.java

@@ -0,0 +1,229 @@
+package com.bweb.model;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class ExportOutRechargeOrder {
+
+    @ExcelProperty("订单号")
+    private String orderNo;
+
+    @ExcelProperty("用户昵称")
+    private String userName;
+
+    @ExcelProperty("用户联系方式")
+    private String userPhone;
+
+    @ExcelProperty("充值类型")
+    private String rechargeModelName;
+
+    @ExcelProperty("充值内容")
+    private String rechargeContent;
+
+    @ExcelProperty("中石油持卡人姓名")
+    private String rechargeName;
+
+    @ExcelProperty("备注")
+    private String remarks;
+
+    @ExcelProperty("支付方式")
+    private String payTypeName;
+
+    @ExcelProperty("订单金额")
+    private BigDecimal orderPrice;
+
+    @ExcelProperty("应付金额")
+    private BigDecimal payPrice;
+
+    @ExcelProperty("实付金额")
+    private BigDecimal payRealPrice;
+
+    @ExcelProperty("订单状态")
+    private String statusName;
+
+    @ExcelProperty("创建时间")
+    private Date createTime;
+
+    @ExcelProperty("支付时间")
+    private Date payTime;
+
+    @ExcelProperty("取消时间")
+    private Date cancelTime;
+
+    @ExcelProperty("完成时间")
+    private Date finishTime;
+
+    @ExcelProperty("退款时间")
+    private Date refundTime;
+
+    @ExcelProperty("退款金额")
+    private BigDecimal refundFee;
+
+    @ExcelProperty("退款订单号")
+    private String outRefundNo;
+
+    @ExcelProperty("第三方退款订单号")
+    private String refundId;
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
+    public String getRechargeModelName() {
+        return rechargeModelName;
+    }
+
+    public void setRechargeModelName(String rechargeModelName) {
+        this.rechargeModelName = rechargeModelName;
+    }
+
+    public String getRechargeContent() {
+        return rechargeContent;
+    }
+
+    public void setRechargeContent(String rechargeContent) {
+        this.rechargeContent = rechargeContent;
+    }
+
+    public String getRechargeName() {
+        return rechargeName;
+    }
+
+    public void setRechargeName(String rechargeName) {
+        this.rechargeName = rechargeName;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getPayTypeName() {
+        return payTypeName;
+    }
+
+    public void setPayTypeName(String payTypeName) {
+        this.payTypeName = payTypeName;
+    }
+
+    public BigDecimal getOrderPrice() {
+        return orderPrice;
+    }
+
+    public void setOrderPrice(BigDecimal orderPrice) {
+        this.orderPrice = orderPrice;
+    }
+
+    public BigDecimal getPayPrice() {
+        return payPrice;
+    }
+
+    public void setPayPrice(BigDecimal payPrice) {
+        this.payPrice = payPrice;
+    }
+
+    public BigDecimal getPayRealPrice() {
+        return payRealPrice;
+    }
+
+    public void setPayRealPrice(BigDecimal payRealPrice) {
+        this.payRealPrice = payRealPrice;
+    }
+
+    public String getStatusName() {
+        return statusName;
+    }
+
+    public void setStatusName(String statusName) {
+        this.statusName = statusName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    public Date getCancelTime() {
+        return cancelTime;
+    }
+
+    public void setCancelTime(Date cancelTime) {
+        this.cancelTime = cancelTime;
+    }
+
+    public Date getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(Date finishTime) {
+        this.finishTime = finishTime;
+    }
+
+    public Date getRefundTime() {
+        return refundTime;
+    }
+
+    public void setRefundTime(Date refundTime) {
+        this.refundTime = refundTime;
+    }
+
+    public BigDecimal getRefundFee() {
+        return refundFee;
+    }
+
+    public void setRefundFee(BigDecimal refundFee) {
+        this.refundFee = refundFee;
+    }
+
+    public String getOutRefundNo() {
+        return outRefundNo;
+    }
+
+    public void setOutRefundNo(String outRefundNo) {
+        this.outRefundNo = outRefundNo;
+    }
+
+    public String getRefundId() {
+        return refundId;
+    }
+
+    public void setRefundId(String refundId) {
+        this.refundId = refundId;
+    }
+}

hai-service/src/main/java/com/hai/dao/HighAgentMapper.java

@@ -39,16 +39,20 @@ public interface HighAgentMapper extends HighAgentMapperExt {
     int deleteByPrimaryKey(Long id);
 
     @Insert({
-        "insert into high_agent (agent_name, agent_address, ",
+        "insert into high_agent (`type`, agent_key, ",
+        "agent_name, agent_address, ",
         "agent_user, agent_phone, ",
         "create_time, `status`, ",
         "user_name, operator_id, ",
-        "operator_name)",
+        "operator_name, ext_1, ",
-        "values (#{agentName,jdbcType=VARCHAR}, #{agentAddress,jdbcType=VARCHAR}, ",
+        "ext_2, ext_3)",
+        "values (#{type,jdbcType=INTEGER}, #{agentKey,jdbcType=VARCHAR}, ",
+        "#{agentName,jdbcType=VARCHAR}, #{agentAddress,jdbcType=VARCHAR}, ",
         "#{agentUser,jdbcType=VARCHAR}, #{agentPhone,jdbcType=VARCHAR}, ",
         "#{createTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ",
         "#{userName,jdbcType=VARCHAR}, #{operatorId,jdbcType=BIGINT}, ",
-        "#{operatorName,jdbcType=VARCHAR})"
+        "#{operatorName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(HighAgent record);
@@ -60,6 +64,8 @@ public interface HighAgentMapper extends HighAgentMapperExt {
     @SelectProvider(type=HighAgentSqlProvider.class, method="selectByExample")
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
+        @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR),
         @Result(column="agent_name", property="agentName", jdbcType=JdbcType.VARCHAR),
         @Result(column="agent_address", property="agentAddress", jdbcType=JdbcType.VARCHAR),
         @Result(column="agent_user", property="agentUser", jdbcType=JdbcType.VARCHAR),
@@ -68,19 +74,24 @@ public interface HighAgentMapper extends HighAgentMapperExt {
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR),
         @Result(column="operator_id", property="operatorId", jdbcType=JdbcType.BIGINT),
-        @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR)
+        @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
     })
     List<HighAgent> selectByExample(HighAgentExample example);
 
     @Select({
         "select",
-        "id, agent_name, agent_address, agent_user, agent_phone, create_time, `status`, ",
+        "id, `type`, agent_key, agent_name, agent_address, agent_user, agent_phone, create_time, ",
-        "user_name, operator_id, operator_name",
+        "`status`, user_name, operator_id, operator_name, ext_1, ext_2, ext_3",
         "from high_agent",
         "where id = #{id,jdbcType=BIGINT}"
     })
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
+        @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR),
         @Result(column="agent_name", property="agentName", jdbcType=JdbcType.VARCHAR),
         @Result(column="agent_address", property="agentAddress", jdbcType=JdbcType.VARCHAR),
         @Result(column="agent_user", property="agentUser", jdbcType=JdbcType.VARCHAR),
@@ -89,7 +100,10 @@ public interface HighAgentMapper extends HighAgentMapperExt {
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR),
         @Result(column="operator_id", property="operatorId", jdbcType=JdbcType.BIGINT),
-        @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR)
+        @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
     })
     HighAgent selectByPrimaryKey(Long id);
 
@@ -104,7 +118,9 @@ public interface HighAgentMapper extends HighAgentMapperExt {
 
     @Update({
         "update high_agent",
-        "set agent_name = #{agentName,jdbcType=VARCHAR},",
+        "set `type` = #{type,jdbcType=INTEGER},",
+          "agent_key = #{agentKey,jdbcType=VARCHAR},",
+          "agent_name = #{agentName,jdbcType=VARCHAR},",
           "agent_address = #{agentAddress,jdbcType=VARCHAR},",
           "agent_user = #{agentUser,jdbcType=VARCHAR},",
           "agent_phone = #{agentPhone,jdbcType=VARCHAR},",
@@ -112,7 +128,10 @@ public interface HighAgentMapper extends HighAgentMapperExt {
           "`status` = #{status,jdbcType=INTEGER},",
           "user_name = #{userName,jdbcType=VARCHAR},",
           "operator_id = #{operatorId,jdbcType=BIGINT},",
-          "operator_name = #{operatorName,jdbcType=VARCHAR}",
+          "operator_name = #{operatorName,jdbcType=VARCHAR},",
+          "ext_1 = #{ext1,jdbcType=VARCHAR},",
+          "ext_2 = #{ext2,jdbcType=VARCHAR},",
+          "ext_3 = #{ext3,jdbcType=VARCHAR}",
         "where id = #{id,jdbcType=BIGINT}"
     })
     int updateByPrimaryKey(HighAgent record);

hai-service/src/main/java/com/hai/dao/HighAgentSqlProvider.java

@@ -28,6 +28,14 @@ public class HighAgentSqlProvider {
         SQL sql = new SQL();
         sql.INSERT_INTO("high_agent");
         
+        if (record.getType() != null) {
+            sql.VALUES("`type`", "#{type,jdbcType=INTEGER}");
+        }
+        
+        if (record.getAgentKey() != null) {
+            sql.VALUES("agent_key", "#{agentKey,jdbcType=VARCHAR}");
+        }
+        
         if (record.getAgentName() != null) {
             sql.VALUES("agent_name", "#{agentName,jdbcType=VARCHAR}");
         }
@@ -64,6 +72,18 @@ public class HighAgentSqlProvider {
             sql.VALUES("operator_name", "#{operatorName,jdbcType=VARCHAR}");
         }
         
+        if (record.getExt1() != null) {
+            sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}");
+        }
+        
         return sql.toString();
     }
 
@@ -74,6 +94,8 @@ public class HighAgentSqlProvider {
         } else {
             sql.SELECT("id");
         }
+        sql.SELECT("`type`");
+        sql.SELECT("agent_key");
         sql.SELECT("agent_name");
         sql.SELECT("agent_address");
         sql.SELECT("agent_user");
@@ -83,6 +105,9 @@ public class HighAgentSqlProvider {
         sql.SELECT("user_name");
         sql.SELECT("operator_id");
         sql.SELECT("operator_name");
+        sql.SELECT("ext_1");
+        sql.SELECT("ext_2");
+        sql.SELECT("ext_3");
         sql.FROM("high_agent");
         applyWhere(sql, example, false);
         
@@ -104,6 +129,14 @@ public class HighAgentSqlProvider {
             sql.SET("id = #{record.id,jdbcType=BIGINT}");
         }
         
+        if (record.getType() != null) {
+            sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
+        }
+        
+        if (record.getAgentKey() != null) {
+            sql.SET("agent_key = #{record.agentKey,jdbcType=VARCHAR}");
+        }
+        
         if (record.getAgentName() != null) {
             sql.SET("agent_name = #{record.agentName,jdbcType=VARCHAR}");
         }
@@ -140,6 +173,18 @@ public class HighAgentSqlProvider {
             sql.SET("operator_name = #{record.operatorName,jdbcType=VARCHAR}");
         }
         
+        if (record.getExt1() != null) {
+            sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        }
+        
         applyWhere(sql, example, true);
         return sql.toString();
     }
@@ -149,6 +194,8 @@ public class HighAgentSqlProvider {
         sql.UPDATE("high_agent");
         
         sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
+        sql.SET("agent_key = #{record.agentKey,jdbcType=VARCHAR}");
         sql.SET("agent_name = #{record.agentName,jdbcType=VARCHAR}");
         sql.SET("agent_address = #{record.agentAddress,jdbcType=VARCHAR}");
         sql.SET("agent_user = #{record.agentUser,jdbcType=VARCHAR}");
@@ -158,6 +205,9 @@ public class HighAgentSqlProvider {
         sql.SET("user_name = #{record.userName,jdbcType=VARCHAR}");
         sql.SET("operator_id = #{record.operatorId,jdbcType=BIGINT}");
         sql.SET("operator_name = #{record.operatorName,jdbcType=VARCHAR}");
+        sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
         
         HighAgentExample example = (HighAgentExample) parameter.get("example");
         applyWhere(sql, example, true);
@@ -168,6 +218,14 @@ public class HighAgentSqlProvider {
         SQL sql = new SQL();
         sql.UPDATE("high_agent");
         
+        if (record.getType() != null) {
+            sql.SET("`type` = #{type,jdbcType=INTEGER}");
+        }
+        
+        if (record.getAgentKey() != null) {
+            sql.SET("agent_key = #{agentKey,jdbcType=VARCHAR}");
+        }
+        
         if (record.getAgentName() != null) {
             sql.SET("agent_name = #{agentName,jdbcType=VARCHAR}");
         }
@@ -204,6 +262,18 @@ public class HighAgentSqlProvider {
             sql.SET("operator_name = #{operatorName,jdbcType=VARCHAR}");
         }
         
+        if (record.getExt1() != null) {
+            sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}");
+        }
+        
         sql.WHERE("id = #{id,jdbcType=BIGINT}");
         
         return sql.toString();

hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java

@@ -1,6 +1,7 @@
 package com.hai.dao;
 
-import com.hai.model.CmsContentModel;
+
+import com.hai.model.OutOrderModel;
 import com.hai.model.OutRechargeOrderModel;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Result;
@@ -8,6 +9,7 @@ import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.type.JdbcType;
 
+
 import java.util.List;
 import java.util.Map;
 
@@ -35,5 +37,36 @@ public interface OutRechargeOrderMapperExt {
             @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL),
             @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL),
     })
-    List<OutRechargeOrderModel> getListOrderCount(@Param("map") Map<String,String> map);
+    List<OutOrderModel> getListOrderCount(@Param("map") Map<String,String> map);
+    
+    @Select({
+           "SELECT" +
+                   " a.order_no orderNo," +
+                   " a.user_name userName," +
+                   " a.user_phone userPhone," +
+                   " case a.recharge_model when 1 then '话费充值' when 2 then '中石化' when 3 then '中石油' end rechargeModelName," +
+                   " a.recharge_content rechargeContent," +
+                   " a.recharge_name rechargeName," +
+                   " a.id_card rechargeIdCard," +
+                   " a.remarks remarks," +
+                   " case a.pay_type when 1 then '支付方式' end payTypeName," +
+                   " a.order_price orderPrice," +
+                   " a.pay_price payPrice," +
+                   " a.pay_real_price payRealPrice," +
+                   " case a.status when 1 then '待支付' when 2 then '已支付' when 3 then '已完成' when 4 then '已取消' when 5 then '已退款' end statusName," +
+                   " a.create_timed createTime," +
+                   " a.pay_time payTime," +
+                   " a.cancel_time cancelTime," +
+                   " a.finish_time finishTime," +
+                   " a.refund_time refundTime," +
+                   " a.refund_fee refundFee," +
+                   " a.out_refund_no outRefundNo," +
+                   " a.refund_id refundId" +
+                   " FROM" +
+                   " out_recharge_order a " +
+                   " ORDER BY" +
+                   " a.create_timed DESC"
+    })
+    List<OutRechargeOrderModel> selectOrderCount(Map<String,Object> map);
+
 }

hai-service/src/main/java/com/hai/entity/HighAgent.java

@@ -15,6 +15,16 @@ import java.util.Date;
 public class HighAgent implements Serializable {
     private Long id;
 
+    /**
+     * 代理商类型  1：卡券代理商  2：充值代理商
+     */
+    private Integer type;
+
+    /**
+     * 代理商编号
+     */
+    private String agentKey;
+
     /**
      * 代理商名称
      */
@@ -57,6 +67,12 @@ public class HighAgent implements Serializable {
      */
     private String operatorName;
 
+    private String ext1;
+
+    private String ext2;
+
+    private String ext3;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -67,6 +83,22 @@ public class HighAgent implements Serializable {
         this.id = id;
     }
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getAgentKey() {
+        return agentKey;
+    }
+
+    public void setAgentKey(String agentKey) {
+        this.agentKey = agentKey;
+    }
+
     public String getAgentName() {
         return agentName;
     }
@@ -139,6 +171,30 @@ public class HighAgent implements Serializable {
         this.operatorName = operatorName;
     }
 
+    public String getExt1() {
+        return ext1;
+    }
+
+    public void setExt1(String ext1) {
+        this.ext1 = ext1;
+    }
+
+    public String getExt2() {
+        return ext2;
+    }
+
+    public void setExt2(String ext2) {
+        this.ext2 = ext2;
+    }
+
+    public String getExt3() {
+        return ext3;
+    }
+
+    public void setExt3(String ext3) {
+        this.ext3 = ext3;
+    }
+
     @Override
     public boolean equals(Object that) {
         if (this == that) {
@@ -152,6 +208,8 @@ public class HighAgent implements Serializable {
         }
         HighAgent other = (HighAgent) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
+            && (this.getAgentKey() == null ? other.getAgentKey() == null : this.getAgentKey().equals(other.getAgentKey()))
             && (this.getAgentName() == null ? other.getAgentName() == null : this.getAgentName().equals(other.getAgentName()))
             && (this.getAgentAddress() == null ? other.getAgentAddress() == null : this.getAgentAddress().equals(other.getAgentAddress()))
             && (this.getAgentUser() == null ? other.getAgentUser() == null : this.getAgentUser().equals(other.getAgentUser()))
@@ -160,7 +218,10 @@ public class HighAgent implements Serializable {
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName()))
             && (this.getOperatorId() == null ? other.getOperatorId() == null : this.getOperatorId().equals(other.getOperatorId()))
-            && (this.getOperatorName() == null ? other.getOperatorName() == null : this.getOperatorName().equals(other.getOperatorName()));
+            && (this.getOperatorName() == null ? other.getOperatorName() == null : this.getOperatorName().equals(other.getOperatorName()))
+            && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
+            && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
+            && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()));
     }
 
     @Override
@@ -168,6 +229,8 @@ public class HighAgent implements Serializable {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
+        result = prime * result + ((getAgentKey() == null) ? 0 : getAgentKey().hashCode());
         result = prime * result + ((getAgentName() == null) ? 0 : getAgentName().hashCode());
         result = prime * result + ((getAgentAddress() == null) ? 0 : getAgentAddress().hashCode());
         result = prime * result + ((getAgentUser() == null) ? 0 : getAgentUser().hashCode());
@@ -177,6 +240,9 @@ public class HighAgent implements Serializable {
         result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode());
         result = prime * result + ((getOperatorId() == null) ? 0 : getOperatorId().hashCode());
         result = prime * result + ((getOperatorName() == null) ? 0 : getOperatorName().hashCode());
+        result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
+        result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
+        result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
         return result;
     }
 
@@ -187,6 +253,8 @@ public class HighAgent implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
+        sb.append(", type=").append(type);
+        sb.append(", agentKey=").append(agentKey);
         sb.append(", agentName=").append(agentName);
         sb.append(", agentAddress=").append(agentAddress);
         sb.append(", agentUser=").append(agentUser);
@@ -196,6 +264,9 @@ public class HighAgent implements Serializable {
         sb.append(", userName=").append(userName);
         sb.append(", operatorId=").append(operatorId);
         sb.append(", operatorName=").append(operatorName);
+        sb.append(", ext1=").append(ext1);
+        sb.append(", ext2=").append(ext2);
+        sb.append(", ext3=").append(ext3);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

hai-service/src/main/java/com/hai/entity/HighAgentExample.java

@@ -185,6 +185,136 @@ public class HighAgentExample {
             return (Criteria) this;
         }
 
+        public Criteria andTypeIsNull() {
+            addCriterion("`type` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("`type` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Integer value) {
+            addCriterion("`type` =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Integer value) {
+            addCriterion("`type` <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Integer value) {
+            addCriterion("`type` >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`type` >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Integer value) {
+            addCriterion("`type` <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("`type` <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Integer> values) {
+            addCriterion("`type` in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Integer> values) {
+            addCriterion("`type` not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Integer value1, Integer value2) {
+            addCriterion("`type` between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("`type` not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyIsNull() {
+            addCriterion("agent_key is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyIsNotNull() {
+            addCriterion("agent_key is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyEqualTo(String value) {
+            addCriterion("agent_key =", value, "agentKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyNotEqualTo(String value) {
+            addCriterion("agent_key <>", value, "agentKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyGreaterThan(String value) {
+            addCriterion("agent_key >", value, "agentKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyGreaterThanOrEqualTo(String value) {
+            addCriterion("agent_key >=", value, "agentKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyLessThan(String value) {
+            addCriterion("agent_key <", value, "agentKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyLessThanOrEqualTo(String value) {
+            addCriterion("agent_key <=", value, "agentKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyLike(String value) {
+            addCriterion("agent_key like", value, "agentKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyNotLike(String value) {
+            addCriterion("agent_key not like", value, "agentKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyIn(List<String> values) {
+            addCriterion("agent_key in", values, "agentKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyNotIn(List<String> values) {
+            addCriterion("agent_key not in", values, "agentKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyBetween(String value1, String value2) {
+            addCriterion("agent_key between", value1, value2, "agentKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentKeyNotBetween(String value1, String value2) {
+            addCriterion("agent_key not between", value1, value2, "agentKey");
+            return (Criteria) this;
+        }
+
         public Criteria andAgentNameIsNull() {
             addCriterion("agent_name is null");
             return (Criteria) this;
@@ -784,6 +914,216 @@ public class HighAgentExample {
             addCriterion("operator_name not between", value1, value2, "operatorName");
             return (Criteria) this;
         }
+
+        public Criteria andExt1IsNull() {
+            addCriterion("ext_1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1IsNotNull() {
+            addCriterion("ext_1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1EqualTo(String value) {
+            addCriterion("ext_1 =", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1NotEqualTo(String value) {
+            addCriterion("ext_1 <>", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1GreaterThan(String value) {
+            addCriterion("ext_1 >", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1GreaterThanOrEqualTo(String value) {
+            addCriterion("ext_1 >=", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1LessThan(String value) {
+            addCriterion("ext_1 <", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1LessThanOrEqualTo(String value) {
+            addCriterion("ext_1 <=", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1Like(String value) {
+            addCriterion("ext_1 like", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1NotLike(String value) {
+            addCriterion("ext_1 not like", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1In(List<String> values) {
+            addCriterion("ext_1 in", values, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1NotIn(List<String> values) {
+            addCriterion("ext_1 not in", values, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1Between(String value1, String value2) {
+            addCriterion("ext_1 between", value1, value2, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1NotBetween(String value1, String value2) {
+            addCriterion("ext_1 not between", value1, value2, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2IsNull() {
+            addCriterion("ext_2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2IsNotNull() {
+            addCriterion("ext_2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2EqualTo(String value) {
+            addCriterion("ext_2 =", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2NotEqualTo(String value) {
+            addCriterion("ext_2 <>", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2GreaterThan(String value) {
+            addCriterion("ext_2 >", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2GreaterThanOrEqualTo(String value) {
+            addCriterion("ext_2 >=", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2LessThan(String value) {
+            addCriterion("ext_2 <", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2LessThanOrEqualTo(String value) {
+            addCriterion("ext_2 <=", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2Like(String value) {
+            addCriterion("ext_2 like", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2NotLike(String value) {
+            addCriterion("ext_2 not like", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2In(List<String> values) {
+            addCriterion("ext_2 in", values, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2NotIn(List<String> values) {
+            addCriterion("ext_2 not in", values, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2Between(String value1, String value2) {
+            addCriterion("ext_2 between", value1, value2, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2NotBetween(String value1, String value2) {
+            addCriterion("ext_2 not between", value1, value2, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3IsNull() {
+            addCriterion("ext_3 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3IsNotNull() {
+            addCriterion("ext_3 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3EqualTo(String value) {
+            addCriterion("ext_3 =", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3NotEqualTo(String value) {
+            addCriterion("ext_3 <>", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3GreaterThan(String value) {
+            addCriterion("ext_3 >", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3GreaterThanOrEqualTo(String value) {
+            addCriterion("ext_3 >=", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3LessThan(String value) {
+            addCriterion("ext_3 <", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3LessThanOrEqualTo(String value) {
+            addCriterion("ext_3 <=", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3Like(String value) {
+            addCriterion("ext_3 like", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3NotLike(String value) {
+            addCriterion("ext_3 not like", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3In(List<String> values) {
+            addCriterion("ext_3 in", values, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3NotIn(List<String> values) {
+            addCriterion("ext_3 not in", values, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3Between(String value1, String value2) {
+            addCriterion("ext_3 between", value1, value2, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3NotBetween(String value1, String value2) {
+            addCriterion("ext_3 not between", value1, value2, "ext3");
+            return (Criteria) this;
+        }
     }
 
     /**

hai-service/src/main/java/com/hai/model/OutOrderModel.java

@@ -0,0 +1,52 @@
+package com.hai.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class OutOrderModel {
+    private Date day;
+
+    private Long count;
+
+    /**
+     * 支付金额
+     */
+    private BigDecimal payPrice;
+
+    /**
+     * 订单充值金额
+     */
+    private BigDecimal orderPrice;
+
+    public Date getDay() {
+        return day;
+    }
+
+    public void setDay(Date day) {
+        this.day = day;
+    }
+
+    public Long getCount() {
+        return count;
+    }
+
+    public void setCount(Long count) {
+        this.count = count;
+    }
+
+    public BigDecimal getPayPrice() {
+        return payPrice;
+    }
+
+    public void setPayPrice(BigDecimal payPrice) {
+        this.payPrice = payPrice;
+    }
+
+    public BigDecimal getOrderPrice() {
+        return orderPrice;
+    }
+
+    public void setOrderPrice(BigDecimal orderPrice) {
+        this.orderPrice = orderPrice;
+    }
+}

hai-service/src/main/java/com/hai/model/OutRechargeOrderModel.java

@@ -5,34 +5,106 @@ import java.util.Date;
 
 public class OutRechargeOrderModel {
 
-    private Date day;
+    private String orderNo;
+    private String userName;
+    private String userPhone;
+    private String rechargeModelName;
+    private String rechargeContent;
+    private String rechargeName;
+    private String rechargeIdCard;
+    private String remarks;
+    private String payTypeName;
+    private String orderPrice;
+    private BigDecimal payPrice;
+    private BigDecimal payRealPrice;
+    private String statusName;
+    private Date createTime;
+    private Date payTime;
+    private Date cancelTime;
+    private Date finishTime;
+    private Date refundTime;
+    private BigDecimal refundFee;
+    private String outRefundNo;
+    private String refundId;
 
-    private Long count;
+    public String getOrderNo() {
+        return orderNo;
+    }
 
-    /**
+    public void setOrderNo(String orderNo) {
-     * 支付金额
+        this.orderNo = orderNo;
-     */
+    }
-    private BigDecimal payPrice;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
+    public String getRechargeModelName() {
+        return rechargeModelName;
+    }
+
+    public void setRechargeModelName(String rechargeModelName) {
+        this.rechargeModelName = rechargeModelName;
+    }
+
+    public String getRechargeContent() {
+        return rechargeContent;
+    }
 
-    /**
+    public void setRechargeContent(String rechargeContent) {
-     * 订单充值金额
+        this.rechargeContent = rechargeContent;
-     */
+    }
-    private BigDecimal orderPrice;
+
+    public String getRechargeName() {
+        return rechargeName;
+    }
+
+    public void setRechargeName(String rechargeName) {
+        this.rechargeName = rechargeName;
+    }
+
+    public String getRechargeIdCard() {
+        return rechargeIdCard;
+    }
+
+    public void setRechargeIdCard(String rechargeIdCard) {
+        this.rechargeIdCard = rechargeIdCard;
+    }
 
-    public Date getDay() {
+    public String getRemarks() {
-        return day;
+        return remarks;
     }
 
-    public void setDay(Date day) {
+    public void setRemarks(String remarks) {
-        this.day = day;
+        this.remarks = remarks;
     }
 
-    public Long getCount() {
+    public String getPayTypeName() {
-        return count;
+        return payTypeName;
     }
 
-    public void setCount(Long count) {
+    public void setPayTypeName(String payTypeName) {
-        this.count = count;
+        this.payTypeName = payTypeName;
+    }
+
+    public String getOrderPrice() {
+        return orderPrice;
+    }
+
+    public void setOrderPrice(String orderPrice) {
+        this.orderPrice = orderPrice;
     }
 
     public BigDecimal getPayPrice() {
@@ -43,11 +115,83 @@ public class OutRechargeOrderModel {
         this.payPrice = payPrice;
     }
 
-    public BigDecimal getOrderPrice() {
+    public BigDecimal getPayRealPrice() {
-        return orderPrice;
+        return payRealPrice;
     }
 
-    public void setOrderPrice(BigDecimal orderPrice) {
+    public void setPayRealPrice(BigDecimal payRealPrice) {
-        this.orderPrice = orderPrice;
+        this.payRealPrice = payRealPrice;
+    }
+
+    public String getStatusName() {
+        return statusName;
+    }
+
+    public void setStatusName(String statusName) {
+        this.statusName = statusName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    public Date getCancelTime() {
+        return cancelTime;
+    }
+
+    public void setCancelTime(Date cancelTime) {
+        this.cancelTime = cancelTime;
+    }
+
+    public Date getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(Date finishTime) {
+        this.finishTime = finishTime;
+    }
+
+    public Date getRefundTime() {
+        return refundTime;
+    }
+
+    public void setRefundTime(Date refundTime) {
+        this.refundTime = refundTime;
+    }
+
+    public BigDecimal getRefundFee() {
+        return refundFee;
+    }
+
+    public void setRefundFee(BigDecimal refundFee) {
+        this.refundFee = refundFee;
+    }
+
+    public String getOutRefundNo() {
+        return outRefundNo;
+    }
+
+    public void setOutRefundNo(String outRefundNo) {
+        this.outRefundNo = outRefundNo;
+    }
+
+    public String getRefundId() {
+        return refundId;
+    }
+
+    public void setRefundId(String refundId) {
+        this.refundId = refundId;
     }
 }

hai-service/src/main/java/com/hai/service/HighAgentService.java

@@ -72,4 +72,10 @@ public interface HighAgentService {
      */
     void insertAgentMsg(HighAgentModel highAgentModel)  throws Exception ;
 
+    /**
+     * 修改代理商信息
+     * @param highAgent
+     */
+    void updateAgentDetail(HighAgent highAgent);
+
 }

hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java

@@ -1,6 +1,7 @@
 package com.hai.service;
 
 import com.hai.entity.OutRechargeOrder;
+import com.hai.model.OutOrderModel;
 import com.hai.model.OutRechargeOrderModel;
 import io.swagger.models.auth.In;
 
@@ -72,6 +73,13 @@ public interface OutRechargeOrderService {
      **/
     void finishOrder(Long orderId);
 
+    /**
+     * 查询订单统计
+     * @param map
+     * @return
+     */
+    List<OutRechargeOrderModel> getOrderCount(Map<String,Object> map);
+
     /**
      * @Author Sum1Dream
      * @Description //查询订单未支付数量 Administrator
@@ -88,6 +96,6 @@ public interface OutRechargeOrderService {
      * @Param [map]
      * @return java.util.List<com.hai.model.OutRechargeOrderModel>
      **/
-    List<OutRechargeOrderModel> getListOrderCount(Map<String , String> map);
+    List<OutOrderModel> getListOrderCount(Map<String , String> map);
 
 }

hai-service/src/main/java/com/hai/service/impl/HighAgentServiceImpl.java

@@ -102,4 +102,9 @@ public class HighAgentServiceImpl implements HighAgentService {
         highAgentModel.getSecUser().setUpdateTime(new Date());
         secUserService.addUser(highAgentModel.getSecUser());
     }
+
+    @Override
+    public void updateAgentDetail(HighAgent highAgent) {
+        highAgentMapper.updateByPrimaryKey(highAgent);
+    }
 }

hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

@@ -3,6 +3,7 @@ package com.hai.service.impl;
 import com.hai.dao.OutRechargeOrderMapper;
 import com.hai.dao.OutRechargeOrderMapperExt;
 import com.hai.entity.*;
+import com.hai.model.OutOrderModel;
 import com.hai.model.OutRechargeOrderModel;
 import com.hai.service.OutRechargeOrderService;
 import org.apache.commons.collections4.MapUtils;
@@ -108,6 +109,11 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
         }
     }
 
+    @Override
+    public List<OutRechargeOrderModel> getOrderCount(Map<String, Object> map) {
+        return outRechargeOrderMapper.selectOrderCount(map);
+    }
+
     @Override
     public Long CountOrder() {
         OutRechargeOrderExample example = new OutRechargeOrderExample();
@@ -116,7 +122,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
     }
 
     @Override
-    public List<OutRechargeOrderModel> getListOrderCount(Map<String, String> map) {
+    public List<OutOrderModel> getListOrderCount(Map<String, String> map) {
         return outRechargeOrderMapperExt.getListOrderCount(map);
     }
 }