Skip to content

G
gdtel-gztel-school-center
Commit 61c301de by 罗承锋
Options

整改宽带订单

parent cbe23d20
Showing with 403 additions and 12 deletions
common/src/main/java/com/winsun/bean/BroadBandOrder.java 0 → 100644
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableField;
import lombok.Data;
import java.util.Date;
@Data
public class BroadBandOrder extends Order{
/**
* 订单号码
*/
@TableField(value = "orderSeq")
private String orderSeq;
/**
* 产品名称
*/
@TableField(value = "productName")
private String productName;
/**
* 套餐
*/
@TableField(value = "order_set_meal")
private String orderSetMeal;
/**
* 学校
*/
@TableField(value = "order_university_name")
private String orderUniversityName;
/**
* 姓名
*/
@TableField(value = "orderName")
private String orderName;
/**
* 提交时间
*/
@TableField(value = "orderDate")
private Date orderDate;
/**
* 订单状态
*/
@TableField(value = "status")
private String status;
/**
* 区域
*/
@TableField(value = "order_region")
private String orderRegion;
/**
* 支付平台：翼支付网厅|支付宝|微信
*/
@TableField(value = "ipay")
private String iPay;
/**
* 支付方式：电脑支付|手机WAY支付|微信扫码支付|公众号支付|支付宝扫码
*/
@TableField(value = "payType")
private String payType;
/**
* 产品价格
*/
@TableField(value = "webOrderAmount")
private String webOrderAmount;
/**
* 支付时间
*/
@TableField(value = "order_payment_time")
private Date orderPaymentTime;
/**
* 穗易付订单号
*/
@TableField(value = "orderReqtranSeq")
private String orderReqtranSeq;
/**
* 接入商
*/
@TableField(value = "customeRid")
private String customerId;
/**
* 联系电话
*/
@TableField(value = "orderPhone")
private String orderPhone;
/**
* 用户类别
*/
@TableField(value = "order_customer_type")
private String orderCustomerType;
/**
* 学生证号
*/
@TableField(value = "order_customer_student_id")
private String orderCustomerStudentId;
/**
* 备注
*/
@TableField(value = "order_customer_remarks")
private String orderCustomerRemarks;
/**
* 多媒体账号
*/
@TableField(value = "order_customer_account")
private String orderCustomerAccount;
/**
* 多媒体密码
*/
@TableField(value = "order_customer_pwd")
private String orderCustomerPwd;
/**
* 支付平台流水号
*/
@TableField(value = "uptranseq")
private String uptranseq;
/**
* 用户显示的速率
*/
@TableField(value = "expenses")
private String expenses;
/**
* 预留字段2
*/
@TableField(value = "order_rf2")
private String orderRf2;
/**
* 智能平台订单号
*/
@TableField(value = "orderSeqTHD")
private String orderseqThd;
/**
* 请求日期参数
*/
private String createTimeStart;
private String createTimeEnd;
private String successTimeStart;
private String successTimeEnd;
private Integer pageNo;
private Integer pageSize;
private Integer pageStart;
}
common/src/main/java/com/winsun/mapper/OrderMapper.java
package com.winsun.mapper;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Component;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.bean.BroadBandOrder;
import com.winsun.bean.Order;
import com.winsun.bean.OrderView;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Component;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Mapper
@Component
......@@ -93,4 +92,6 @@ public interface OrderMapper extends BaseMapper<Order> {
" and product_title = #{productTitle} and product_region = #{universityRegion} and product_university = #{universityName} and product_state=0 ")
List<Map<String,Object>> queProductNameDataToUniversityNameData(String productTitle, String universityRegion, String universityName);
List<BroadBandOrder> selectBroadBandOrderList(BroadBandOrder broadBandOrder);
}
service-manager/src/main/java/com/winsun/constant/OrderType.java 0 → 100644
package com.winsun.constant;
/**
* 订单类型
*/
public enum OrderType {
ZERO("0", "新用户办卡"),
ONE("1", "放号登记"),
TWO("2","存量升级"),
THREE("3", "小白卡"),
FOUR("4", "羊城通"),
FIVE("5", "线上预制卡"),
SIX("6", "线上小白卡"),
SEVEN("7", "自助终端");
private String code;
private String name;
private OrderType(String code, String name) {
this.code = code;
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static String getNameByCode(String code) {
OrderType[] values = values();
for(OrderType orderType : values) {
if (orderType.getCode().equals(code)) {
return orderType.getName();
}
}
return "";
}
public static String getCodeByName(String name) {
OrderType[] values = values();
for(OrderType orderType : values) {
if (orderType.getName().equals(name)) {
return orderType.getCode();
}
}
return "";
}
}
service-manager/src/main/java/com/winsun/controller/OrderController.java
......@@ -14,13 +14,11 @@ import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.auth.core.util.IOUtils;
import com.winsun.bean.Order;
import com.winsun.bean.School;
import com.winsun.bean.SysUser;
import com.winsun.bean.YrymReport;
import com.winsun.bean.*;
import com.winsun.mapper.*;
import com.winsun.rabbitmq.RabbitProducer;
import com.winsun.utils.*;
import com.winsun.utils.Constant;
import lombok.extern.slf4j.Slf4j;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
......@@ -249,6 +247,24 @@ public class OrderController extends BaseController {
}
/**
* 查询宽带订单
* @param broadBandOrder
* @return
*/
@Permission(menuname = "查询订单信息", value = "broadBandOrder", method = RequestMethod.POST)
public ResponseData<Page<BroadBandOrder>> getBroadBandOrder(BroadBandOrder broadBandOrder) {
broadBandOrder.setPageStart((broadBandOrder.getPageNo() - 1) * broadBandOrder.getPageSize());
List<BroadBandOrder> broadBandOrders = orderMapper.selectBroadBandOrderList(broadBandOrder);
Page<BroadBandOrder> page = new Page<>(broadBandOrder.getPageNo(), broadBandOrder.getPageSize());
page.setRecords(broadBandOrders);
System.out.println(JSONArray.fromObject(broadBandOrders).toString());
return ResponseData.success(page);
}
/**
* 编辑订单
*
* @return
......
service-manager/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.winsun.mapper.OrderMapper">
<resultMap id="broadBandOrder" type="com.winsun.bean.BroadBandOrder">
<result column="order_number" property="orderNumber" />
<result column="xb_order_id" property="xbOrderId" />
<result column="order_id" property="orderId" />
<result column="order_status" property="orderStatus" />
<result column="hehuoren_id" property="hehuorenId" />
<result column="package_id" property="packageId" />
<result column="customer_name" property="customerName" />
<result column="business_number" property="businessNumber" />
<result column="contact_number" property="contactNumber" />
<result column="id_card" property="idCard" />
<result column="business_iccid" property="businessIccid" />
<result column="kapin" property="kapin" />
<result column="id_cardz" property="idCardz" />
<result column="id_cardf" property="idCardf" />
<result column="id_cardzs" property="idCardzs" />
<result column="studen_card" property="studenCard" />
<result column="create_time" property="createTime" />
<result column="success_time" property="successTime" />
<result column="address" property="address" />
<result column="remarks" property="remarks" />
<result column="site" property="site" />
<result column="msg" property="msg" />
<result column="send_type" property="sendType" />
<result column="now_package" property="nowPackage" />
<result column="business_package" property="businessPackage" />
<result column="user_bussiness_type" property="userBussinessType" />
<result column="user_type" property="userType" />
<result column="accept_result" property="acceptResult" />
<result column="accept_name" property="acceptName" />
<result column="accept_comment" property="acceptComment" />
<result column="accept_date" property="acceptDate" />
<result column="yj_count" property="yjCount" />
<result column="yj_type" property="yjType" />
<result column="tj_type" property="tjType" />
<result column="xb_type" property="xbType" />
<result column="net_number" property="netNumber" />
<result column="net_password" property="netPassword" />
<result column="userSchool" property="userSchool" />
<result column="check_fail" property="checkFail" />
<result column="expenses" property="expenses" />
<result column="identifying" property="identifying" />
<result column="kd_order_id" property="kdOrderId" />
<result column="gift_account" property="giftAccount" />
<result column="gift_password" property="giftCypher" />
<result column="hehuoren_area" property="hehuorenArea" />
<result column="hehuoren_name" property="hehuorenName" />
<result column="hehuoren_school" property="hehuorenSchool" />
<result column="hehuoren_phone" property="hehuorenPhone" />
<result column="supervisor_name" property="supervisorName" />
<result column="th_status" property="thStatus" />
<result column="rh_time" property="rhTime" />
<result column="orderSeq" property="orderSeq" />
<result column="productName" property="productName" />
<result column="order_set_meal" property="orderSetMeal" />
<result column="order_university_name" property="orderUniversityName" />
<result column="orderName" property="orderName" />
<result column="orderDate" property="orderDate" />
<result column="status" property="status" />
<result column="order_region" property="orderRegion" />
<result column="ipay" property="iPay" />
<result column="payType" property="payType" />
<result column="webOrderAmount" property="webOrderAmount" />
<result column="order_payment_time" property="orderPaymentTime" />
<result column="orderReqtranSeq" property="orderReqtranSeq" />
<result column="customeRid" property="customerId" />
<result column="orderPhone" property="orderPhone" />
<result column="order_customer_type" property="orderCustomerType" />
<result column="order_customer_student_id" property="orderCustomerStudentId" />
<result column="order_customer_remarks" property="orderCustomerRemarks" />
<result column="order_customer_account" property="orderCustomerAccount" />
<result column="order_customer_pwd" property="orderCustomerPwd" />
<result column="uptranseq" property="uptranseq" />
<result column="expenses" property="expenses" />
<result column="order_rf2" property="orderRf2"></result>
<result column="orderSeqTHD" property="orderseqThd" />
</resultMap>
<select id="selectBroadBandOrderList" resultMap="broadBandOrder">
select
ho.*,
ov.productName,
ov.order_set_meal,
ov.order_university_name,
ov.orderName,
ov.ipay,
ov.payType,
ov.webOrderAmount,
ov.order_payment_time,
ov.orderReqtranSeq,
ov.customeRid,
ov.orderPhone,
ov.order_customer_type,
ov.order_customer_student_id,
ov.order_customer_remarks,
ov.order_customer_account,
ov.order_customer_pwd,
ov.uptranseq,
ov.expenses,
ov.order_rf2,
ov.orderSeqTHD,
ov.order_region,
ov.orderDate
from (
select * from hhr_order
where
kd_order_id is not null
and user_type in (3,5,9,10)
<if test="createTimeStart != null and createTimeStart != ''">
and create_time &gt;= #{createTimeStart}
</if>
<if test="createTimeEnd != null and createTimeEnd != ''">
and create_time &lt;= #{createTimeEnd}
</if>
<if test="successTimeStart != null and successTimeStart != ''">
and success_time = &gt;= #{successTimeStart}
</if>
<if test="successTimeEnd != null and successTimeEnd != ''">
and success_time = &lt;= #{successTimeEnd}
</if>
<if test="userType != null and userType != ''">
and user_type = #{userType}
</if>
<if test="hehuorenArea != null and hehuorenArea != ''">
and hehuoren_area = #{hehuorenArea}
</if>
<if test="orderStatus != null and orderStatus != ''">
and order_status = #{orderStatus}
</if>
<if test="hehuorenSchool != null and hehuorenSchool != ''">
and hehuoren_school = #{hehuorenSchool}
</if>
<if test="orderNumber != null and orderNumber != ''">
and order_number = #{orderNumber}
</if>
<if test="hehuorenName != null and hehuorenName != ''">
and hehuoren_name = #{hehuorenName}
</if>
<if test="contactNumber != null and contactNumber != ''">
and contact_number = #{contactNumber}
</if>
<if test="businessNumber != null and businessNumber != ''">
and business_number = #{businessNumber}
</if>
<if test="customerName != null and customerName != ''">
and customer_name = #{customerName}
</if>
<if test="orderId != null and orderId != ''">
and order_id = #{orderId}
</if>
) ho,order_view ov
where
ho.kd_order_id = ov.orderSeq
limit #{pageStart},#{pageSize}
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment