first commit

src/main/java/com/thmodel/entity/CashRecord.java

@@ -23,13 +23,11 @@ public class CashRecord {
     private String intro;           //支付说明
     private String pstate;          //支付状态
     private String wid;             //微信ID/支付宝账号
-
     private String username;        //用户姓名
     private String phone;           //手机号
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date   accountingdate;  //到账时间
-
-    private int accflag;            //结算状态
+    private int    accflag;         //结算状态
 
     public int getAccflag() {
         return accflag;

src/main/java/com/thmodel/entity/MemberInfo.java

@@ -6,303 +6,383 @@ import com.alibaba.fastjson.annotation.JSONField;
 
 /**
  * 会员/账号信息表
- * @author Administrator
  *
+ * @author Administrator
  */
 public class MemberInfo {
-	
-	private int 	pk;
-	private int 	membtype;	//会员类别
-	private int		membclass;	//会员级别
-	private String 	qrcode;		//二维码编号
-	private String 	tel;		//帐号
-	private String  phone;		//电话号码
-	private String 	pass;		//密码
-	private String 	paypass;	//支付密码
-	private String 	pet;		//昵称
-	private String 	hphoto;		//头像
-	private String 	photo;		//照片
-	private int 	area;		//地区						
-	private String 	age;		//年龄				
-	private String 	id;			//身份证号				
-	private int 	islive;		//消息提醒
-	@JSONField(format="yyyy-MM-dd HH:mm:ss")
-	private Date 	mdate;		//注册日期
-	private String 	token;		//消息令牌				
-	private int 	acc;		//积分
-	@JSONField(format="yyyy-MM-dd HH:mm:ss")
-	private Date 	lastsign;	//最后一次签到					
-	private int 	signdays;	//连续签到多到天					
-	private int 	introducerpk;//推荐人pk					
-	private String 	identify;	//认证状态				
-	private String 	id_a;		//身份证正面				
-	private String 	id_b;		//身份证反面				
-	private String 	id_c;		//手持身份拍照				
-	private String 	wid;		//微信提现帐号				
-	private double 	coin_a;		//账户总币额（虚拟贝）			
-	private double 	coin_ir;	//红包收入币额		
-	private double 	coin_iv;	//聊天收到币额	
-	private double 	coin_is;	//服务收入币额			
-	private double 	coin_irr;	//红包分红币额			
-	private double 	coin_ivv;	//聊天分成币额		
-	private double 	coin_iss;	//服务分成币额		
-	private double 	coin_ill;	//队长收入币额
-	private double 	coin_i;		//冲值币额
-	private double 	coin_or;	//红包支付币额
-	private double 	coin_ov;	//聊天支付币额
-	private double 	coin_os;	//订单支付币额
-	private double 	coin_om;	//模卡支付币额
-	private double 	coin_o;		//提现支出币额
-	private double 	coin_oi;	//预支币额
-	
-	
-	public double getCoin_a() {
-		return coin_a;
-	}
-	public void setCoin_a(double coin_a) {
-		this.coin_a = coin_a;
-	}
-	public int getPk() {
-		return pk;
-	}
-	public void setPk(int pk) {
-		this.pk = pk;
-	}
-	public int getMembtype() {
-		return membtype;
-	}
-	public void setMembtype(int membtype) {
-		this.membtype = membtype;
-	}
-	public int getMembclass() {
-		return membclass;
-	}
-	public void setMembclass(int membclass) {
-		this.membclass = membclass;
-	}
-	public String getQrcode() {
-		return qrcode;
-	}
-	public void setQrcode(String qrcode) {
-		this.qrcode = qrcode;
-	}
-	public String getTel() {
-		return tel;
-	}
-	public void setTel(String tel) {
-		this.tel = tel;
-	}
-	public String getPass() {
-		return pass;
-	}
-	public void setPass(String pass) {
-		this.pass = pass;
-	}
-	public String getPaypass() {
-		return paypass;
-	}
-	public void setPaypass(String paypass) {
-		this.paypass = paypass;
-	}
-	public String getPet() {
-		return pet;
-	}
-	public void setPet(String pet) {
-		this.pet = pet;
-	}
-	public String getHphoto() {
-		return hphoto;
-	}
-	public void setHphoto(String hphoto) {
-		this.hphoto = hphoto;
-	}
-	public String getPhoto() {
-		return photo;
-	}
-	public void setPhoto(String photo) {
-		this.photo = photo;
-	}
-	public int getArea() {
-		return area;
-	}
-	public void setArea(int area) {
-		this.area = area;
-	}
-	public String getAge() {
-		return age;
-	}
-	public void setAge(String age) {
-		this.age = age;
-	}
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public int getIslive() {
-		return islive;
-	}
-	public void setIslive(int islive) {
-		this.islive = islive;
-	}
-	public Date getMdate() {
-		return mdate;
-	}
-	public void setMdate(Date mdate) {
-		this.mdate = mdate;
-	}
-	public String getToken() {
-		return token;
-	}
-	public void setToken(String token) {
-		this.token = token;
-	}
-	public int getAcc() {
-		return acc;
-	}
-	public void setAcc(int acc) {
-		this.acc = acc;
-	}
-	public Date getLastsign() {
-		return lastsign;
-	}
-	public void setLastsign(Date lastsign) {
-		this.lastsign = lastsign;
-	}
-	public int getSigndays() {
-		return signdays;
-	}
-	public void setSigndays(int signdays) {
-		this.signdays = signdays;
-	}
-	public int getIntroducerpk() {
-		return introducerpk;
-	}
-	public void setIntroducerpk(int introducerpk) {
-		this.introducerpk = introducerpk;
-	}
-	public String getIdentify() {
-		return identify;
-	}
-	public void setIdentify(String identify) {
-		this.identify = identify;
-	}
-	public String getId_a() {
-		return id_a;
-	}
-	public void setId_a(String id_a) {
-		this.id_a = id_a;
-	}
-	public String getId_b() {
-		return id_b;
-	}
-	public void setId_b(String id_b) {
-		this.id_b = id_b;
-	}
-	public String getId_c() {
-		return id_c;
-	}
-	public void setId_c(String id_c) {
-		this.id_c = id_c;
-	}
-	public String getWid() {
-		return wid;
-	}
-	public void setWid(String wid) {
-		this.wid = wid;
-	}
-	
-	public double getCoin_ir() {
-		return coin_ir;
-	}
-	public void setCoin_ir(double coin_ir) {
-		this.coin_ir = coin_ir;
-	}
-	public double getCoin_iv() {
-		return coin_iv;
-	}
-	public void setCoin_iv(double coin_iv) {
-		this.coin_iv = coin_iv;
-	}
-	public double getCoin_is() {
-		return coin_is;
-	}
-	public void setCoin_is(double coin_is) {
-		this.coin_is = coin_is;
-	}
-	public double getCoin_irr() {
-		return coin_irr;
-	}
-	public void setCoin_irr(double coin_irr) {
-		this.coin_irr = coin_irr;
-	}
-	public double getCoin_ivv() {
-		return coin_ivv;
-	}
-	public void setCoin_ivv(double coin_ivv) {
-		this.coin_ivv = coin_ivv;
-	}
-	public double getCoin_iss() {
-		return coin_iss;
-	}
-	public void setCoin_iss(double coin_iss) {
-		this.coin_iss = coin_iss;
-	}
-	public double getCoin_ill() {
-		return coin_ill;
-	}
-	public void setCoin_ill(double coin_ill) {
-		this.coin_ill = coin_ill;
-	}
-	public double getCoin_i() {
-		return coin_i;
-	}
-	public void setCoin_i(double coin_i) {
-		this.coin_i = coin_i;
-	}
-	public double getCoin_or() {
-		return coin_or;
-	}
-	public void setCoin_or(double coin_or) {
-		this.coin_or = coin_or;
-	}
-	public double getCoin_ov() {
-		return coin_ov;
-	}
-	public void setCoin_ov(double coin_ov) {
-		this.coin_ov = coin_ov;
-	}
-	public double getCoin_os() {
-		return coin_os;
-	}
-	public void setCoin_os(double coin_os) {
-		this.coin_os = coin_os;
-	}
-	public double getCoin_om() {
-		return coin_om;
-	}
-	public void setCoin_om(double coin_om) {
-		this.coin_om = coin_om;
-	}
-	public double getCoin_o() {
-		return coin_o;
-	}
-	public void setCoin_o(double coin_o) {
-		this.coin_o = coin_o;
-	}
-	public double getCoin_oi() {
-		return coin_oi;
-	}
-	public void setCoin_oi(double coin_oi) {
-		this.coin_oi = coin_oi;
-	}
-	public String getPhone() {
-		return phone;
-	}
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
-	
-	
+
+    private int    pk;
+    private int    membtype;        //会员类别
+    private int    membclass;       //会员级别
+    private String qrcode;          //二维码编号
+    private String tel;             //帐号
+    private String phone;           //电话号码
+    private String pass;            //密码
+    private String paypass;         //支付密码
+    private String pet;             //昵称
+    private String hphoto;          //头像
+    private String photo;           //照片
+    private int    area;            //地区
+    private String age;             //年龄
+    private String id;              //身份证号
+    private int    islive;          //消息提醒
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date   mdate;           //注册日期
+    private String token;           //消息令牌
+    private int    acc;             //积分
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date   lastsign;        //最后一次签到
+    private int    signdays;        //连续签到多到天
+    private int    introducerpk;    //推荐人pk
+    private String identify;        //认证状态
+    private String id_a;            //身份证正面
+    private String id_b;            //身份证反面
+    private String id_c;            //手持身份拍照
+    private String wid;             //微信提现帐号
+    private double coin_a;          //账户总币额（虚拟贝）
+    private double coin_ir;         //红包收入币额
+    private double coin_iv;         //聊天收到币额
+    private double coin_is;         //服务收入币额
+    private double coin_irr;        //红包分红币额
+    private double coin_ivv;        //聊天分成币额
+    private double coin_iss;        //服务分成币额
+    private double coin_ill;        //队长收入币额
+    private double coin_i;          //冲值币额
+    private double coin_or;         //红包支付币额
+    private double coin_ov;         //聊天支付币额
+    private double coin_os;         //订单支付币额
+    private double coin_om;         //模卡支付币额
+    private double coin_o;          //提现支出币额
+    private double coin_oi;         //预支币额
+
+
+    public double getCoin_a() {
+        return coin_a;
+    }
+
+    public void setCoin_a(double coin_a) {
+        this.coin_a = coin_a;
+    }
+
+    public int getPk() {
+        return pk;
+    }
+
+    public void setPk(int pk) {
+        this.pk = pk;
+    }
+
+    public int getMembtype() {
+        return membtype;
+    }
+
+    public void setMembtype(int membtype) {
+        this.membtype = membtype;
+    }
+
+    public int getMembclass() {
+        return membclass;
+    }
+
+    public void setMembclass(int membclass) {
+        this.membclass = membclass;
+    }
+
+    public String getQrcode() {
+        return qrcode;
+    }
+
+    public void setQrcode(String qrcode) {
+        this.qrcode = qrcode;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    public String getPass() {
+        return pass;
+    }
+
+    public void setPass(String pass) {
+        this.pass = pass;
+    }
+
+    public String getPaypass() {
+        return paypass;
+    }
+
+    public void setPaypass(String paypass) {
+        this.paypass = paypass;
+    }
+
+    public String getPet() {
+        return pet;
+    }
+
+    public void setPet(String pet) {
+        this.pet = pet;
+    }
+
+    public String getHphoto() {
+        return hphoto;
+    }
+
+    public void setHphoto(String hphoto) {
+        this.hphoto = hphoto;
+    }
+
+    public String getPhoto() {
+        return photo;
+    }
+
+    public void setPhoto(String photo) {
+        this.photo = photo;
+    }
+
+    public int getArea() {
+        return area;
+    }
+
+    public void setArea(int area) {
+        this.area = area;
+    }
+
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public int getIslive() {
+        return islive;
+    }
+
+    public void setIslive(int islive) {
+        this.islive = islive;
+    }
+
+    public Date getMdate() {
+        return mdate;
+    }
+
+    public void setMdate(Date mdate) {
+        this.mdate = mdate;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public int getAcc() {
+        return acc;
+    }
+
+    public void setAcc(int acc) {
+        this.acc = acc;
+    }
+
+    public Date getLastsign() {
+        return lastsign;
+    }
+
+    public void setLastsign(Date lastsign) {
+        this.lastsign = lastsign;
+    }
+
+    public int getSigndays() {
+        return signdays;
+    }
+
+    public void setSigndays(int signdays) {
+        this.signdays = signdays;
+    }
+
+    public int getIntroducerpk() {
+        return introducerpk;
+    }
+
+    public void setIntroducerpk(int introducerpk) {
+        this.introducerpk = introducerpk;
+    }
+
+    public String getIdentify() {
+        return identify;
+    }
+
+    public void setIdentify(String identify) {
+        this.identify = identify;
+    }
+
+    public String getId_a() {
+        return id_a;
+    }
+
+    public void setId_a(String id_a) {
+        this.id_a = id_a;
+    }
+
+    public String getId_b() {
+        return id_b;
+    }
+
+    public void setId_b(String id_b) {
+        this.id_b = id_b;
+    }
+
+    public String getId_c() {
+        return id_c;
+    }
+
+    public void setId_c(String id_c) {
+        this.id_c = id_c;
+    }
+
+    public String getWid() {
+        return wid;
+    }
+
+    public void setWid(String wid) {
+        this.wid = wid;
+    }
+
+    public double getCoin_ir() {
+        return coin_ir;
+    }
+
+    public void setCoin_ir(double coin_ir) {
+        this.coin_ir = coin_ir;
+    }
+
+    public double getCoin_iv() {
+        return coin_iv;
+    }
+
+    public void setCoin_iv(double coin_iv) {
+        this.coin_iv = coin_iv;
+    }
+
+    public double getCoin_is() {
+        return coin_is;
+    }
+
+    public void setCoin_is(double coin_is) {
+        this.coin_is = coin_is;
+    }
+
+    public double getCoin_irr() {
+        return coin_irr;
+    }
+
+    public void setCoin_irr(double coin_irr) {
+        this.coin_irr = coin_irr;
+    }
+
+    public double getCoin_ivv() {
+        return coin_ivv;
+    }
+
+    public void setCoin_ivv(double coin_ivv) {
+        this.coin_ivv = coin_ivv;
+    }
+
+    public double getCoin_iss() {
+        return coin_iss;
+    }
+
+    public void setCoin_iss(double coin_iss) {
+        this.coin_iss = coin_iss;
+    }
+
+    public double getCoin_ill() {
+        return coin_ill;
+    }
+
+    public void setCoin_ill(double coin_ill) {
+        this.coin_ill = coin_ill;
+    }
+
+    public double getCoin_i() {
+        return coin_i;
+    }
+
+    public void setCoin_i(double coin_i) {
+        this.coin_i = coin_i;
+    }
+
+    public double getCoin_or() {
+        return coin_or;
+    }
+
+    public void setCoin_or(double coin_or) {
+        this.coin_or = coin_or;
+    }
+
+    public double getCoin_ov() {
+        return coin_ov;
+    }
+
+    public void setCoin_ov(double coin_ov) {
+        this.coin_ov = coin_ov;
+    }
+
+    public double getCoin_os() {
+        return coin_os;
+    }
+
+    public void setCoin_os(double coin_os) {
+        this.coin_os = coin_os;
+    }
+
+    public double getCoin_om() {
+        return coin_om;
+    }
+
+    public void setCoin_om(double coin_om) {
+        this.coin_om = coin_om;
+    }
+
+    public double getCoin_o() {
+        return coin_o;
+    }
+
+    public void setCoin_o(double coin_o) {
+        this.coin_o = coin_o;
+    }
+
+    public double getCoin_oi() {
+        return coin_oi;
+    }
+
+    public void setCoin_oi(double coin_oi) {
+        this.coin_oi = coin_oi;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+
 }

src/main/java/com/thmodel/entity/ModelAct.java

@@ -8,89 +8,99 @@ import com.alibaba.fastjson.annotation.JSONField;
  * 人才视频表
  */
 public class ModelAct {
-	
-	private int pk;
-	
-	private int modelpk;//人才PK
-	
-	private int orderpk;//顺序
-	
-	private String caption;//视频标题
-	
-	private String pic;//视频图片
-	
-	private String video;//视频
-	
-	private String intro;//摘要
-	
-	private int ucount;//用户评价好数
-	
-	private int dcount;//用户评价差数
-	
-	@JSONField(format="yyyy-MM-dd HH:mm:ss")
-	private Date adate;//日期
-	
-	
-	public int getPk() {
-		return pk;
-	}
-	public void setPk(int pk) {
-		this.pk = pk;
-	}
-	public int getModelpk() {
-		return modelpk;
-	}
-	public void setModelpk(int modelpk) {
-		this.modelpk = modelpk;
-	}
-	public int getOrderpk() {
-		return orderpk;
-	}
-	public void setOrderpk(int orderpk) {
-		this.orderpk = orderpk;
-	}
-	public String getCaption() {
-		return caption;
-	}
-	public void setCaption(String caption) {
-		this.caption = caption;
-	}
-	public String getPic() {
-		return pic;
-	}
-	public void setPic(String pic) {
-		this.pic = pic;
-	}
-	public String getVideo() {
-		return video;
-	}
-	public void setVideo(String video) {
-		this.video = video;
-	}
-	public String getIntro() {
-		return intro;
-	}
-	public void setIntro(String intro) {
-		this.intro = intro;
-	}
-	public int getUcount() {
-		return ucount;
-	}
-	public void setUcount(int ucount) {
-		this.ucount = ucount;
-	}
-	public int getDcount() {
-		return dcount;
-	}
-	public void setDcount(int dcount) {
-		this.dcount = dcount;
-	}
-	public Date getAdate() {
-		return adate;
-	}
-	public void setAdate(Date adate) {
-		this.adate = adate;
-	}
-	
-	
+
+    private int    pk;
+    private int    modelpk;     //人才PK
+    private int    orderpk;     //顺序
+    private String caption;     //视频标题
+    private String pic;         //视频图片
+    private String video;       //视频
+    private String intro;       //摘要
+    private int    ucount;      //用户评价好数
+    private int    dcount;      //用户评价差数
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date   adate;       //日期
+
+
+    public int getPk() {
+        return pk;
+    }
+
+    public void setPk(int pk) {
+        this.pk = pk;
+    }
+
+    public int getModelpk() {
+        return modelpk;
+    }
+
+    public void setModelpk(int modelpk) {
+        this.modelpk = modelpk;
+    }
+
+    public int getOrderpk() {
+        return orderpk;
+    }
+
+    public void setOrderpk(int orderpk) {
+        this.orderpk = orderpk;
+    }
+
+    public String getCaption() {
+        return caption;
+    }
+
+    public void setCaption(String caption) {
+        this.caption = caption;
+    }
+
+    public String getPic() {
+        return pic;
+    }
+
+    public void setPic(String pic) {
+        this.pic = pic;
+    }
+
+    public String getVideo() {
+        return video;
+    }
+
+    public void setVideo(String video) {
+        this.video = video;
+    }
+
+    public String getIntro() {
+        return intro;
+    }
+
+    public void setIntro(String intro) {
+        this.intro = intro;
+    }
+
+    public int getUcount() {
+        return ucount;
+    }
+
+    public void setUcount(int ucount) {
+        this.ucount = ucount;
+    }
+
+    public int getDcount() {
+        return dcount;
+    }
+
+    public void setDcount(int dcount) {
+        this.dcount = dcount;
+    }
+
+    public Date getAdate() {
+        return adate;
+    }
+
+    public void setAdate(Date adate) {
+        this.adate = adate;
+    }
+
+
 }

src/main/java/com/thmodel/entity/ModelCard.java

@@ -1,70 +1,64 @@
 package com.thmodel.entity;
 
 /**
- *  模卡信息表
+ * 模卡信息表
  */
 public class ModelCard {
-	
-	private int pk;
-	
-	private String cardname;//模卡名称
-	
-	private String sample;//样例图片
-	
-	private String url;//模卡URL
-	
-	private double price;//模卡价币（按天）
-	
-	private double fee;//收入
-
-	public int getPk() {
-		return pk;
-	}
-
-	public void setPk(int pk) {
-		this.pk = pk;
-	}
-
-	public String getCardname() {
-		return cardname;
-	}
-
-	public void setCardname(String cardname) {
-		this.cardname = cardname;
-	}
-
-	public String getSample() {
-		return sample;
-	}
-
-	public void setSample(String sample) {
-		this.sample = sample;
-	}
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public double getPrice() {
-		return price;
-	}
-
-	public void setPrice(double price) {
-		this.price = price;
-	}
-
-	public double getFee() {
-		return fee;
-	}
-
-	public void setFee(double fee) {
-		this.fee = fee;
-	}
-	
-	
-	
+
+    private int    pk;
+    private String cardname;    //模卡名称
+    private String sample;      //样例图片
+    private String url;         //模卡URL
+    private double price;       //模卡价币（按天）
+    private double fee;         //收入
+
+    public int getPk() {
+        return pk;
+    }
+
+    public void setPk(int pk) {
+        this.pk = pk;
+    }
+
+    public String getCardname() {
+        return cardname;
+    }
+
+    public void setCardname(String cardname) {
+        this.cardname = cardname;
+    }
+
+    public String getSample() {
+        return sample;
+    }
+
+    public void setSample(String sample) {
+        this.sample = sample;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public double getPrice() {
+        return price;
+    }
+
+    public void setPrice(double price) {
+        this.price = price;
+    }
+
+    public double getFee() {
+        return fee;
+    }
+
+    public void setFee(double fee) {
+        this.fee = fee;
+    }
+
+
 }

src/main/java/com/thmodel/entity/ModelPrice.java

@@ -6,94 +6,86 @@ import com.alibaba.fastjson.annotation.JSONField;
 
 /**
  * 人才服务定价表
- * @author Administrator
  *
+ * @author Administrator
  */
 public class ModelPrice {
-	
-	
-	@JSONField(name="pricepk")
-	private int pk;
-	
-	private int modelpk;//人才PK
-	@JSONField(format="yyyy-MM-dd HH:mm:ss")
-	private Date pdate;//定价日期
-	
-	private String pname;//服务名称
-	
-	private double price;//价格
-	
-	private String unit;//价格单位
-	
-	private int orderid;//排序
-	
-	private int skillpk;//技能标签PK
-
-	public int getPk() {
-		return pk;
-	}
-
-	public void setPk(int pk) {
-		this.pk = pk;
-	}
-
-	public int getModelpk() {
-		return modelpk;
-	}
-
-	public void setModelpk(int modelpk) {
-		this.modelpk = modelpk;
-	}
-
-	public Date getPdate() {
-		return pdate;
-	}
-
-	public void setPdate(Date pdate) {
-		this.pdate = pdate;
-	}
-
-	public String getPname() {
-		return pname;
-	}
-
-	public void setPname(String pname) {
-		this.pname = pname;
-	}
-
-	public double getPrice() {
-		return price;
-	}
-
-	public void setPrice(double price) {
-		this.price = price;
-	}
-
-	public String getUnit() {
-		return unit;
-	}
-
-	public void setUnit(String unit) {
-		this.unit = unit;
-	}
-
-	public int getOrderid() {
-		return orderid;
-	}
-
-	public void setOrderid(int orderid) {
-		this.orderid = orderid;
-	}
-
-	public int getSkillpk() {
-		return skillpk;
-	}
-
-	public void setSkillpk(int skillpk) {
-		this.skillpk = skillpk;
-	}
-	
-	
-	
-	
+
+
+    @JSONField(name = "pricepk")
+    private int    pk;
+    private int    modelpk; //人才PK
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date   pdate;   //定价日期
+    private String pname;   //服务名称
+    private double price;   //价格
+    private String unit;    //价格单位
+    private int    orderid; //排序
+    private int    skillpk; //技能标签PK
+
+    public int getPk() {
+        return pk;
+    }
+
+    public void setPk(int pk) {
+        this.pk = pk;
+    }
+
+    public int getModelpk() {
+        return modelpk;
+    }
+
+    public void setModelpk(int modelpk) {
+        this.modelpk = modelpk;
+    }
+
+    public Date getPdate() {
+        return pdate;
+    }
+
+    public void setPdate(Date pdate) {
+        this.pdate = pdate;
+    }
+
+    public String getPname() {
+        return pname;
+    }
+
+    public void setPname(String pname) {
+        this.pname = pname;
+    }
+
+    public double getPrice() {
+        return price;
+    }
+
+    public void setPrice(double price) {
+        this.price = price;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public int getOrderid() {
+        return orderid;
+    }
+
+    public void setOrderid(int orderid) {
+        this.orderid = orderid;
+    }
+
+    public int getSkillpk() {
+        return skillpk;
+    }
+
+    public void setSkillpk(int skillpk) {
+        this.skillpk = skillpk;
+    }
+
+
 }

src/main/java/com/thmodel/entity/ModelPrivate.java

@@ -8,78 +8,71 @@ import com.alibaba.fastjson.annotation.JSONField;
  * 人才私密空间
  */
 public class ModelPrivate {
-	
-	private int pk;
-	
-	private int modelpk;//人才PK
-	@JSONField(format="yyyy-MM-dd HH:mm:ss")
-	private Date pdate;//日期
-	
-	private String intro;//这一刻的想法
-	
-	private int ucount;//用户评价好数
-	
-	private int dcount;//用户评价差数
-	
-	private int islikes;//是否点赞
-
-	public int getPk() {
-		return pk;
-	}
-
-	public void setPk(int pk) {
-		this.pk = pk;
-	}
-
-	public int getModelpk() {
-		return modelpk;
-	}
-
-	public void setModelpk(int modelpk) {
-		this.modelpk = modelpk;
-	}
-
-	public Date getPdate() {
-		return pdate;
-	}
-
-	public void setPdate(Date pdate) {
-		this.pdate = pdate;
-	}
-
-	public String getIntro() {
-		return intro;
-	}
-
-	public void setIntro(String intro) {
-		this.intro = intro;
-	}
-
-	public int getUcount() {
-		return ucount;
-	}
-
-	public void setUcount(int ucount) {
-		this.ucount = ucount;
-	}
-
-	public int getDcount() {
-		return dcount;
-	}
-
-	public void setDcount(int dcount) {
-		this.dcount = dcount;
-	}
-
-	public int getIslikes() {
-		return islikes;
-	}
-
-	public void setIslikes(int islikes) {
-		this.islikes = islikes;
-	}
-	
-	
-	
-	
+
+    private int    pk;
+    private int    modelpk; //人才PK
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date   pdate;   //日期
+    private String intro;   //这一刻的想法
+    private int    ucount;  //用户评价好数
+    private int    dcount;  //用户评价差数
+    private int    islikes; //是否点赞
+
+    public int getPk() {
+        return pk;
+    }
+
+    public void setPk(int pk) {
+        this.pk = pk;
+    }
+
+    public int getModelpk() {
+        return modelpk;
+    }
+
+    public void setModelpk(int modelpk) {
+        this.modelpk = modelpk;
+    }
+
+    public Date getPdate() {
+        return pdate;
+    }
+
+    public void setPdate(Date pdate) {
+        this.pdate = pdate;
+    }
+
+    public String getIntro() {
+        return intro;
+    }
+
+    public void setIntro(String intro) {
+        this.intro = intro;
+    }
+
+    public int getUcount() {
+        return ucount;
+    }
+
+    public void setUcount(int ucount) {
+        this.ucount = ucount;
+    }
+
+    public int getDcount() {
+        return dcount;
+    }
+
+    public void setDcount(int dcount) {
+        this.dcount = dcount;
+    }
+
+    public int getIslikes() {
+        return islikes;
+    }
+
+    public void setIslikes(int islikes) {
+        this.islikes = islikes;
+    }
+
+
 }

src/main/java/com/thmodel/entity/OrderRecord.java

@@ -5,221 +5,198 @@ import java.util.Date;
 import com.alibaba.fastjson.annotation.JSONField;
 
 public class OrderRecord {
-	
-	private int pk;
-	
-	private int memberpk;//会员PK
-	
-	private int modelpk;//人才PK
-	
-	private int brokerpk;//经纪人PK
-	
-	private int lederpk;//队长PK
-	@JSONField(format="yyyy-MM-dd HH:mm:ss")
-	private Date odate;//订单日期
-	@JSONField(format="yyyy-MM-dd HH:mm:ss")
-	private Date sdate;//服务日期时间
-	
-	private int skillpk;//技能标签PK
-	
-	private double scount;//服务时长
-	
-	private String sname;//服务名称
-	
-	private double sprice;//价格
-	
-	private double coin;//支付费用
-	
-	/**
-	 * 0：待付款    1：待完成   2：进行中   3：已完成
-	 * 
-	 */
-	private String orderstate;//订单状态
-	
-	private String intro;//订单说明
-	
-	private double ec;//客户评价
-	
-	private String evaluate;//评价说明
-	
-	private String linkman;//联系人
-	
-	private String linkphone;//联系方式
-	
-	private String addr;//工作地点
-	
-	private int accflag;//支付状态
-	private int hasred;//是否已读
-
-	
-	public int getAccflag() {
-		return accflag;
-	}
-
-	public void setAccflag(int accflag) {
-		this.accflag = accflag;
-	}
-
-	public int getHasred() {
-		return hasred;
-	}
-
-	public void setHasred(int hasred) {
-		this.hasred = hasred;
-	}
-
-	public int getPk() {
-		return pk;
-	}
-
-	public void setPk(int pk) {
-		this.pk = pk;
-	}
-
-	public int getMemberpk() {
-		return memberpk;
-	}
-
-	public void setMemberpk(int memberpk) {
-		this.memberpk = memberpk;
-	}
-
-	public int getModelpk() {
-		return modelpk;
-	}
-
-	public void setModelpk(int modelpk) {
-		this.modelpk = modelpk;
-	}
-
-	public int getBrokerpk() {
-		return brokerpk;
-	}
-
-	public void setBrokerpk(int brokerpk) {
-		this.brokerpk = brokerpk;
-	}
-
-	public int getLederpk() {
-		return lederpk;
-	}
-
-	public void setLederpk(int lederpk) {
-		this.lederpk = lederpk;
-	}
-
-	public Date getOdate() {
-		return odate;
-	}
-
-	public void setOdate(Date odate) {
-		this.odate = odate;
-	}
-
-	public Date getSdate() {
-		return sdate;
-	}
-
-	public void setSdate(Date sdate) {
-		this.sdate = sdate;
-	}
-
-	public int getSkillpk() {
-		return skillpk;
-	}
-
-	public void setSkillpk(int skillpk) {
-		this.skillpk = skillpk;
-	}
-
-	public double getScount() {
-		return scount;
-	}
-
-	public void setScount(double scount) {
-		this.scount = scount;
-	}
-
-	public String getSname() {
-		return sname;
-	}
-
-	public void setSname(String sname) {
-		this.sname = sname;
-	}
-
-	public double getSprice() {
-		return sprice;
-	}
-
-	public void setSprice(double sprice) {
-		this.sprice = sprice;
-	}
 
-	public double getCoin() {
-		return coin;
-	}
+    private int    pk;
+    private int    memberpk;    //会员PK
+    private int    modelpk;     //人才PK
+    private int    brokerpk;    //经纪人PK
+    private int    lederpk;     //队长PK
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date   odate;       //订单日期
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date   sdate;       //服务日期时间
+    private int    skillpk;     //技能标签PK
+    private double scount;      //服务时长
+    private String sname;       //服务名称
+    private double sprice;      //价格
+    private double coin;        //支付费用
+    private String orderstate;  //订单状态  0：待付款    1：待完成   2：进行中   3：已完成
+    private String intro;       //订单说明
+    private double ec;          //客户评价
+    private String evaluate;    //评价说明
+    private String linkman;     //联系人
+    private String linkphone;   //联系方式
+    private String addr;        //工作地点
+    private int    accflag;     //支付状态
+    private int    hasred;      //是否已读
+
+    public int getAccflag() {
+        return accflag;
+    }
+
+    public void setAccflag(int accflag) {
+        this.accflag = accflag;
+    }
+
+    public int getHasred() {
+        return hasred;
+    }
+
+    public void setHasred(int hasred) {
+        this.hasred = hasred;
+    }
+
+    public int getPk() {
+        return pk;
+    }
+
+    public void setPk(int pk) {
+        this.pk = pk;
+    }
+
+    public int getMemberpk() {
+        return memberpk;
+    }
+
+    public void setMemberpk(int memberpk) {
+        this.memberpk = memberpk;
+    }
+
+    public int getModelpk() {
+        return modelpk;
+    }
+
+    public void setModelpk(int modelpk) {
+        this.modelpk = modelpk;
+    }
+
+    public int getBrokerpk() {
+        return brokerpk;
+    }
+
+    public void setBrokerpk(int brokerpk) {
+        this.brokerpk = brokerpk;
+    }
+
+    public int getLederpk() {
+        return lederpk;
+    }
+
+    public void setLederpk(int lederpk) {
+        this.lederpk = lederpk;
+    }
+
+    public Date getOdate() {
+        return odate;
+    }
+
+    public void setOdate(Date odate) {
+        this.odate = odate;
+    }
+
+    public Date getSdate() {
+        return sdate;
+    }
+
+    public void setSdate(Date sdate) {
+        this.sdate = sdate;
+    }
+
+    public int getSkillpk() {
+        return skillpk;
+    }
+
+    public void setSkillpk(int skillpk) {
+        this.skillpk = skillpk;
+    }
+
+    public double getScount() {
+        return scount;
+    }
+
+    public void setScount(double scount) {
+        this.scount = scount;
+    }
+
+    public String getSname() {
+        return sname;
+    }
 
-	public void setCoin(double coin) {
-		this.coin = coin;
-	}
+    public void setSname(String sname) {
+        this.sname = sname;
+    }
 
-	public String getOrderstate() {
-		return orderstate;
-	}
+    public double getSprice() {
+        return sprice;
+    }
 
-	public void setOrderstate(String orderstate) {
-		this.orderstate = orderstate;
-	}
+    public void setSprice(double sprice) {
+        this.sprice = sprice;
+    }
 
-	public String getIntro() {
-		return intro;
-	}
+    public double getCoin() {
+        return coin;
+    }
 
-	public void setIntro(String intro) {
-		this.intro = intro;
-	}
+    public void setCoin(double coin) {
+        this.coin = coin;
+    }
 
-	public double getEc() {
-		return ec;
-	}
+    public String getOrderstate() {
+        return orderstate;
+    }
 
-	public void setEc(double ec) {
-		this.ec = ec;
-	}
+    public void setOrderstate(String orderstate) {
+        this.orderstate = orderstate;
+    }
 
-	public String getEvaluate() {
-		return evaluate;
-	}
+    public String getIntro() {
+        return intro;
+    }
 
-	public void setEvaluate(String evaluate) {
-		this.evaluate = evaluate;
-	}
+    public void setIntro(String intro) {
+        this.intro = intro;
+    }
 
-	public String getLinkman() {
-		return linkman;
-	}
+    public double getEc() {
+        return ec;
+    }
 
-	public void setLinkman(String linkman) {
-		this.linkman = linkman;
-	}
+    public void setEc(double ec) {
+        this.ec = ec;
+    }
 
-	public String getLinkphone() {
-		return linkphone;
-	}
+    public String getEvaluate() {
+        return evaluate;
+    }
 
-	public void setLinkphone(String linkphone) {
-		this.linkphone = linkphone;
-	}
+    public void setEvaluate(String evaluate) {
+        this.evaluate = evaluate;
+    }
+
+    public String getLinkman() {
+        return linkman;
+    }
+
+    public void setLinkman(String linkman) {
+        this.linkman = linkman;
+    }
+
+    public String getLinkphone() {
+        return linkphone;
+    }
+
+    public void setLinkphone(String linkphone) {
+        this.linkphone = linkphone;
+    }
+
+    public String getAddr() {
+        return addr;
+    }
+
+    public void setAddr(String addr) {
+        this.addr = addr;
+    }
 
-	public String getAddr() {
-		return addr;
-	}
 
-	public void setAddr(String addr) {
-		this.addr = addr;
-	}
-	
-	
-	
 }

src/main/java/com/thmodel/entity/ParttyInfo.java

@@ -5,136 +5,164 @@ import java.util.Date;
 import com.alibaba.fastjson.annotation.JSONField;
 
 public class ParttyInfo {
-	
-	private int pk;
-	private String pic;//图片
-	private String caption;//标题
-	private String intro;//活动简介
-	private String term;//参与条件
-	@JSONField(format="yyyy-MM-dd HH:mm:ss")
-	private Date sbeg;//报名开始时间
-	@JSONField(format="yyyy-MM-dd HH:mm:ss")
-	private Date sendt;//报名截止时间
-	@JSONField(format="yyyy-MM-dd HH:mm:ss")
-	private Date beg;//活动开始时间
-	@JSONField(format="yyyy-MM-dd HH:mm:ss")
-	private Date endt;//活动结束时间
-	private double meprice;//会员单价
-	private double moprice;//模特单价
-	private double brprice;//经纪人单价
-	
-	private int isbanner;//是否是横幅
-	private String banner;//横幅图片
-	
-	private int signcount;	//活动报名人数
-	private int issigndate;	//是否到活动开始报名时间之后
-	
-	private int issign;
-	
-	
-	
-	public int getSigncount() {
-		return signcount;
-	}
-	public void setSigncount(int signcount) {
-		this.signcount = signcount;
-	}
-	public int getPk() {
-		return pk;
-	}
-	public void setPk(int pk) {
-		this.pk = pk;
-	}
-	public String getPic() {
-		return pic;
-	}
-	public void setPic(String pic) {
-		this.pic = pic;
-	}
-	public String getCaption() {
-		return caption;
-	}
-	public void setCaption(String caption) {
-		this.caption = caption;
-	}
-	public String getIntro() {
-		return intro;
-	}
-	public void setIntro(String intro) {
-		this.intro = intro;
-	}
-	public String getTerm() {
-		return term;
-	}
-	public void setTerm(String term) {
-		this.term = term;
-	}
-	public Date getSbeg() {
-		return sbeg;
-	}
-	public void setSbeg(Date sbeg) {
-		this.sbeg = sbeg;
-	}
-	public Date getSendt() {
-		return sendt;
-	}
-	public void setSendt(Date sendt) {
-		this.sendt = sendt;
-	}
-	public Date getBeg() {
-		return beg;
-	}
-	public void setBeg(Date beg) {
-		this.beg = beg;
-	}
-	public Date getEndt() {
-		return endt;
-	}
-	public void setEndt(Date endt) {
-		this.endt = endt;
-	}
-	public double getMeprice() {
-		return meprice;
-	}
-	public void setMeprice(double meprice) {
-		this.meprice = meprice;
-	}
-	public double getMoprice() {
-		return moprice;
-	}
-	public void setMoprice(double moprice) {
-		this.moprice = moprice;
-	}
-	public double getBrprice() {
-		return brprice;
-	}
-	public void setBrprice(double brprice) {
-		this.brprice = brprice;
-	}
-	public int getIssign() {
-		return issign;
-	}
-	public void setIssign(int issign) {
-		this.issign = issign;
-	}
-	public int getIsbanner() {
-		return isbanner;
-	}
-	public void setIsbanner(int isbanner) {
-		this.isbanner = isbanner;
-	}
-	public String getBanner() {
-		return banner;
-	}
-	public void setBanner(String banner) {
-		this.banner = banner;
-	}
-	public int getIssigndate() {
-		return issigndate;
-	}
-	public void setIssigndate(int issigndate) {
-		this.issigndate = issigndate;
-	}
-
-	
+
+    private int    pk;
+    private String pic;         //图片
+    private String caption;     //标题
+    private String intro;       //活动简介
+    private String term;        //参与条件
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date   sbeg;        //报名开始时间
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date   sendt;       //报名截止时间
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date   beg;         //活动开始时间
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date   endt;        //活动结束时间
+    private double meprice;     //会员单价
+    private double moprice;     //模特单价
+    private double brprice;     //经纪人单价
+    private int    isbanner;    //是否是横幅
+    private String banner;      //横幅图片
+    private int    signcount;   //活动报名人数
+    private int    issigndate;  //是否到活动开始报名时间之后
+    private int    issign;
+
+    public int getSigncount() {
+        return signcount;
+    }
+
+    public void setSigncount(int signcount) {
+        this.signcount = signcount;
+    }
+
+    public int getPk() {
+        return pk;
+    }
+
+    public void setPk(int pk) {
+        this.pk = pk;
+    }
+
+    public String getPic() {
+        return pic;
+    }
+
+    public void setPic(String pic) {
+        this.pic = pic;
+    }
+
+    public String getCaption() {
+        return caption;
+    }
+
+    public void setCaption(String caption) {
+        this.caption = caption;
+    }
+
+    public String getIntro() {
+        return intro;
+    }
+
+    public void setIntro(String intro) {
+        this.intro = intro;
+    }
+
+    public String getTerm() {
+        return term;
+    }
+
+    public void setTerm(String term) {
+        this.term = term;
+    }
+
+    public Date getSbeg() {
+        return sbeg;
+    }
+
+    public void setSbeg(Date sbeg) {
+        this.sbeg = sbeg;
+    }
+
+    public Date getSendt() {
+        return sendt;
+    }
+
+    public void setSendt(Date sendt) {
+        this.sendt = sendt;
+    }
+
+    public Date getBeg() {
+        return beg;
+    }
+
+    public void setBeg(Date beg) {
+        this.beg = beg;
+    }
+
+    public Date getEndt() {
+        return endt;
+    }
+
+    public void setEndt(Date endt) {
+        this.endt = endt;
+    }
+
+    public double getMeprice() {
+        return meprice;
+    }
+
+    public void setMeprice(double meprice) {
+        this.meprice = meprice;
+    }
+
+    public double getMoprice() {
+        return moprice;
+    }
+
+    public void setMoprice(double moprice) {
+        this.moprice = moprice;
+    }
+
+    public double getBrprice() {
+        return brprice;
+    }
+
+    public void setBrprice(double brprice) {
+        this.brprice = brprice;
+    }
+
+    public int getIssign() {
+        return issign;
+    }
+
+    public void setIssign(int issign) {
+        this.issign = issign;
+    }
+
+    public int getIsbanner() {
+        return isbanner;
+    }
+
+    public void setIsbanner(int isbanner) {
+        this.isbanner = isbanner;
+    }
+
+    public String getBanner() {
+        return banner;
+    }
+
+    public void setBanner(String banner) {
+        this.banner = banner;
+    }
+
+    public int getIssigndate() {
+        return issigndate;
+    }
+
+    public void setIssigndate(int issigndate) {
+        this.issigndate = issigndate;
+    }
+
+
 }

src/main/java/com/thmodel/service/impl/OrderServiceImpl.java

@@ -26,252 +26,250 @@ import com.thmodel.result.ResultProcedure;
 
 public class OrderServiceImpl implements OrderService {
 
-	private static OrderRecordDao orderRecordDao = new OrderRecordDaoImpl();
-	private static ModelInfoDao modelInfoDao = new ModelInfoDaoImpl();
-	private static MemberinfoDao memberinfoDao = new MemberinfoDaoImpl();
-
-	@Override
-	public int putOrder(OrderParam model) {
-		// 返回生成的订单编号
-		int pk = orderRecordDao.insertOrderRecord(model);
-		return pk;
-	}
-
-	@Override
-	public Page getOrder(int memberPk, String state, int index, int size) {
-		if (memberPk > 0) {
-			// 全部订单
-			if (state.equals("all")) {
-				return orderRecordDao.findOrderRecordByMemberPk(memberPk, null, index, size);
-			}
-			// 待付款
-			else if (state.equals("1")) {
-				String state_0 = OrderConstants.STATE_CODE_0;
-				return orderRecordDao.findOrderRecordByMemberPk(memberPk, null, index, size, state_0);
-			}
-			// 进行中
-			else if (state.equals("2")) {
-				String state_1 = OrderConstants.STATE_CODE_1;
-				String state_3 = OrderConstants.STATE_CODE_3;
-				return orderRecordDao.findOrderRecordByMemberPk(memberPk, null, index, size, state_1, state_3);
-			}
-			// 已完成
-			else if (state.equals("3")) {
-				String state_5 = OrderConstants.STATE_CODE_5;
-				String state_6 = OrderConstants.STATE_CODE_6;
-				return orderRecordDao.findOrderRecordByMemberPk(memberPk, null, index, size, state_5, state_6);
-			}
-			//取消（用户取消,模特取消）
-			else if(state.equals("4")) {
-				String state_2 = OrderConstants.STATE_CODE_2;
-				String state_4 = OrderConstants.STATE_CODE_4;
-				return orderRecordDao.findOrderRecordByMemberPk(memberPk, null, index, size, state_2, state_4);
-			}
-			else {
-				return null;
-			}
-
-		} else {
-			return null;
-		}
-	}
-	
-	@Override
-	public Page getModelOrder(int modelpk, String state, int index, int size) {
-		if (modelpk > 0) {
-			// 全部订单
-			if (state.equals("all")) {
-				String state_1 = OrderConstants.STATE_CODE_1;
-				String state_3 = OrderConstants.STATE_CODE_3;
-				String state_4 = OrderConstants.STATE_CODE_4;
-				String state_5 = OrderConstants.STATE_CODE_5;
-				String state_6 = OrderConstants.STATE_CODE_6;
-				return orderRecordDao.findOrderRecordByMemberPk(null, modelpk, index, size, state_1, state_3, state_4, state_5, state_6);
-			}
-			// 待接单
-			else if (state.equals("1")) {
-				String state_1 = OrderConstants.STATE_CODE_1;
-				return orderRecordDao.findOrderRecordByMemberPk(null, modelpk, index, size, state_1);
-			}
-			// 进行中
-			else if (state.equals("2")) {
-				String state_3 = OrderConstants.STATE_CODE_3;
-				return orderRecordDao.findOrderRecordByMemberPk(null, modelpk, index, size, state_3);
-			}
-			// 已完成
-			else if (state.equals("3")) {
-				String state_5 = OrderConstants.STATE_CODE_5;
-				String state_6 = OrderConstants.STATE_CODE_6;
-				return orderRecordDao.findOrderRecordByMemberPk(null, modelpk, index, size, state_5, state_6);
-			}
-			else {
-				return null;
-			}
-
-		} else {
-			return null;
-		}
-	}
-	
-
-	@Override
-	public boolean ecorder(int orderPk, String ec, String evaluate) {
-		boolean flag = false;
-		if (orderPk > 0) {
-			int rows = orderRecordDao.updateOrderComment(orderPk, ec, evaluate);
-			if (rows > 0) {
-				flag = true;
-			}
-		}
-		return flag;
-	}
-
-	@Override
-	public boolean cancelOrderModel(int orderpk, int modelpk) {
-		//模特取消扣除模特的钱？
-		boolean flag = false;
-		if (orderpk > 0 && modelpk > 0) {
-			// 获取当前订单信息
-			OrderRecord order = orderRecordDao.findOrderRecordByPk(orderpk);
-			
-			int memberpk = order.getMemberpk();
-			double order_coin = order.getCoin();
-			
-			String setState = OrderConstants.STATE_CODE_4;// 模特取消
-			String whereState_1 = OrderConstants.STATE_CODE_1;// 当这个订单状态为 已付款 时
-			String whereState_3 = OrderConstants.STATE_CODE_3;//
-			int rows = orderRecordDao.updateOrderRecordSetStateModelpk(orderpk, modelpk, 0,setState, whereState_1, whereState_3);
-			if (rows > 0) {
-				flag = true;
-				//把订单里面的钱返还给用户
-				//memberinfoDao.updateMemberCoinOToCoinA_Disable()
-				//memberinfoDao.updateMemberCoinOToCoinA(memberpk, order_coin, order_coin);
-				SystemPayConstants sysPay = new SystemPayConstants();
-				sysPay.executeYuZhi_minus(memberpk, order_coin);
-			}
-		}
-		return flag;
-	}
-
-	@Override
-	public boolean confirMorderModel(int orderpk, int modelpk) {
-		boolean flag = false;
-		if (orderpk > 0 && modelpk > 0) {
-			String setState = OrderConstants.STATE_CODE_3; // 模特接单
-			String whereState = OrderConstants.STATE_CODE_1;// 当这个订单状态为 客户下单 时
-			
-			int rows = orderRecordDao.updateOrderRecordSetStateModelpk(orderpk, modelpk, 1, setState, whereState);
-			if (rows > 0) {
-				flag = true;
-			}
-		}
-		return flag;
-	}
-
-	@Override
-	public Map<String, Object> payOrder(int orderpk) {
-		Map<String, Object> resultMap = new HashMap<String, Object>();
-		boolean flag = false;
-		String desc = "";
-		if (orderpk > 0) {
-
-			// 获取当前订单信息
-			OrderRecord order = orderRecordDao.findOrderRecordByPk(orderpk);
-			
-			int order_memberpk = order.getMemberpk(); // 会员pk
-			double order_coin = order.getCoin(); // 订单金额
-			/*
-			 * int order_modelpk = order.getModelpk(); //人才pk int order_model_memberpk =
-			 * modelInfoDao.getMemberpkByModelpk(order_modelpk);//模特的会员pk
-			 */
-
-			int memberpk = order.getMemberpk();
-			
-			// 订单付款，放到预付款金额里面
-			SystemPayConstants systemPayConstants = new SystemPayConstants();
-			boolean pay_flag = systemPayConstants.executeYuZhi_add(order_memberpk, order_coin);
-			if(pay_flag) {
-				//支付成功
-				
-				String setState = OrderConstants.STATE_CODE_1; // 用户付款
-				// 当这个订单的状态为 这几个 时
-				String whereState_1 = OrderConstants.STATE_CODE_0;
-				int rows = orderRecordDao.updateOrderRecordSetStateMemberpk(orderpk, memberpk, setState, whereState_1);
-				if (rows > 0) {
-					flag = true;
-					modelInfoDao.updateModelSetHasRedByModel(order.getModelpk(), 1);
-				}
-			}else {
-				desc = "余额不足";
-			}
-			
-		}
-		resultMap.put("flag", flag);
-		resultMap.put("orderstate", OrderConstants.getOrderState(orderRecordDao.findOrderRecordByPk(orderpk).getOrderstate()));
-		resultMap.put("desc", desc);
-		
-		return resultMap;
-	}
-
-	@Override
-	public Map<String, Object> cancelOrder(int orderpk) {
-		Map<String, Object> resultMap = new HashMap<String, Object>();
-		boolean flag = false;
-		String orderstate = "";
-		if (orderpk > 0) {
-			// 获取当前订单信息
-			OrderRecord order = orderRecordDao.findOrderRecordByPk(orderpk);
-			
-			int memberpk = order.getMemberpk();
-			double order_coin = order.getCoin();
-			String setState = OrderConstants.STATE_CODE_2;// 未付款状态
-			
-			// 当订单状态为一下几种状态 时 可以取消订单
-			String whereState_0 = OrderConstants.STATE_CODE_0;//未付款
-			
-			
-			int rows = orderRecordDao.updateOrderRecordSetStateMemberpk(orderpk, memberpk, setState, whereState_0);
-			if (rows > 0) {
-				flag = true;
-				
-				//把订单里面的钱返还给用户   扣除手续费
-				//updateMemberCoinOToCoinA_Disable()
-				//memberinfoDao.updateMemberCoinOToCoinA(memberpk, order_coin, plus_coin_a);
-				
-				SystemPayConstants sysPay = new SystemPayConstants();
-				sysPay.executeYuZhi_minus(memberpk, order_coin);
-				
-			}
-		}
-		orderstate = OrderConstants.getOrderState(orderRecordDao.findOrderRecordByPk(orderpk).getOrderstate());
-		resultMap.put("flag", flag);
-		resultMap.put("orderstate", orderstate);
-		
-		return resultMap;
-	}
-
-	@Override
-	public Map<String, Object> settlementOrder(int orderpk) {
-		Map<String, Object> resultMap = new HashMap<String, Object>();
-		boolean flag = false;
-		String desc = "";
-		// 获取当前订单信息
-		OrderRecord order = orderRecordDao.findOrderRecordByPk(orderpk);
-		
-		//判断时间是否到订单结束时间？
-		boolean isEndTime = orderRecordDao.isOrderEndTime(order.getPk());
-		if(isEndTime) {
-			if (orderpk > 0) {
-				int accflag = order.getAccflag();
-				//可以结算
-				if(accflag == 1) {
-					int memberpk = order.getMemberpk();
-		
-					String setState = OrderConstants.STATE_CODE_5;// 订单结算
-					String whereState_3 = OrderConstants.STATE_CODE_3;
-					
-					SystemPayConstants sysPay = new SystemPayConstants();
-					ResultProcedure rp = sysPay.procedure(SystemPayConstants.PROCEDURE_TABLENAME_ORDERRECORD, orderpk);
+    private static OrderRecordDao orderRecordDao = new OrderRecordDaoImpl();
+    private static ModelInfoDao   modelInfoDao   = new ModelInfoDaoImpl();
+    private static MemberinfoDao  memberinfoDao  = new MemberinfoDaoImpl();
+
+    @Override
+    public int putOrder(OrderParam model) {
+        // 返回生成的订单编号
+        int pk = orderRecordDao.insertOrderRecord(model);
+        return pk;
+    }
+
+    @Override
+    public Page getOrder(int memberPk, String state, int index, int size) {
+        if (memberPk > 0) {
+            // 全部订单
+            if (state.equals("all")) {
+                return orderRecordDao.findOrderRecordByMemberPk(memberPk, null, index, size);
+            }
+            // 待付款
+            else if (state.equals("1")) {
+                String state_0 = OrderConstants.STATE_CODE_0;
+                return orderRecordDao.findOrderRecordByMemberPk(memberPk, null, index, size, state_0);
+            }
+            // 进行中
+            else if (state.equals("2")) {
+                String state_1 = OrderConstants.STATE_CODE_1;
+                String state_3 = OrderConstants.STATE_CODE_3;
+                return orderRecordDao.findOrderRecordByMemberPk(memberPk, null, index, size, state_1, state_3);
+            }
+            // 已完成
+            else if (state.equals("3")) {
+                String state_5 = OrderConstants.STATE_CODE_5;
+                String state_6 = OrderConstants.STATE_CODE_6;
+                return orderRecordDao.findOrderRecordByMemberPk(memberPk, null, index, size, state_5, state_6);
+            }
+            //取消（用户取消,模特取消）
+            else if (state.equals("4")) {
+                String state_2 = OrderConstants.STATE_CODE_2;
+                String state_4 = OrderConstants.STATE_CODE_4;
+                return orderRecordDao.findOrderRecordByMemberPk(memberPk, null, index, size, state_2, state_4);
+            } else {
+                return null;
+            }
+
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Page getModelOrder(int modelpk, String state, int index, int size) {
+        if (modelpk > 0) {
+            // 全部订单
+            if (state.equals("all")) {
+                String state_1 = OrderConstants.STATE_CODE_1;
+                String state_3 = OrderConstants.STATE_CODE_3;
+                String state_4 = OrderConstants.STATE_CODE_4;
+                String state_5 = OrderConstants.STATE_CODE_5;
+                String state_6 = OrderConstants.STATE_CODE_6;
+                return orderRecordDao.findOrderRecordByMemberPk(null, modelpk, index, size, state_1, state_3, state_4, state_5, state_6);
+            }
+            // 待接单
+            else if (state.equals("1")) {
+                String state_1 = OrderConstants.STATE_CODE_1;
+                return orderRecordDao.findOrderRecordByMemberPk(null, modelpk, index, size, state_1);
+            }
+            // 进行中
+            else if (state.equals("2")) {
+                String state_3 = OrderConstants.STATE_CODE_3;
+                return orderRecordDao.findOrderRecordByMemberPk(null, modelpk, index, size, state_3);
+            }
+            // 已完成
+            else if (state.equals("3")) {
+                String state_5 = OrderConstants.STATE_CODE_5;
+                String state_6 = OrderConstants.STATE_CODE_6;
+                return orderRecordDao.findOrderRecordByMemberPk(null, modelpk, index, size, state_5, state_6);
+            } else {
+                return null;
+            }
+
+        } else {
+            return null;
+        }
+    }
+
+
+    @Override
+    public boolean ecorder(int orderPk, String ec, String evaluate) {
+        boolean flag = false;
+        if (orderPk > 0) {
+            int rows = orderRecordDao.updateOrderComment(orderPk, ec, evaluate);
+            if (rows > 0) {
+                flag = true;
+            }
+        }
+        return flag;
+    }
+
+    @Override
+    public boolean cancelOrderModel(int orderpk, int modelpk) {
+        //模特取消扣除模特的钱？
+        boolean flag = false;
+        if (orderpk > 0 && modelpk > 0) {
+            // 获取当前订单信息
+            OrderRecord order = orderRecordDao.findOrderRecordByPk(orderpk);
+
+            int    memberpk   = order.getMemberpk();
+            double order_coin = order.getCoin();
+
+            String setState     = OrderConstants.STATE_CODE_4;// 模特取消
+            String whereState_1 = OrderConstants.STATE_CODE_1;// 当这个订单状态为 已付款 时
+            String whereState_3 = OrderConstants.STATE_CODE_3;//
+            int    rows         = orderRecordDao.updateOrderRecordSetStateModelpk(orderpk, modelpk, 0, setState, whereState_1, whereState_3);
+            if (rows > 0) {
+                flag = true;
+                //把订单里面的钱返还给用户
+                //memberinfoDao.updateMemberCoinOToCoinA_Disable()
+                //memberinfoDao.updateMemberCoinOToCoinA(memberpk, order_coin, order_coin);
+                SystemPayConstants sysPay = new SystemPayConstants();
+                sysPay.executeYuZhi_minus(memberpk, order_coin);
+            }
+        }
+        return flag;
+    }
+
+    @Override
+    public boolean confirMorderModel(int orderpk, int modelpk) {
+        boolean flag = false;
+        if (orderpk > 0 && modelpk > 0) {
+            String setState   = OrderConstants.STATE_CODE_3; // 模特接单
+            String whereState = OrderConstants.STATE_CODE_1;// 当这个订单状态为 客户下单 时
+
+            int rows = orderRecordDao.updateOrderRecordSetStateModelpk(orderpk, modelpk, 1, setState, whereState);
+            if (rows > 0) {
+                flag = true;
+            }
+        }
+        return flag;
+    }
+
+    @Override
+    public Map<String, Object> payOrder(int orderpk) {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        boolean             flag      = false;
+        String              desc      = "";
+        if (orderpk > 0) {
+
+            // 获取当前订单信息
+            OrderRecord order = orderRecordDao.findOrderRecordByPk(orderpk);
+
+            int    order_memberpk = order.getMemberpk(); // 会员pk
+            double order_coin     = order.getCoin(); // 订单金额
+            /*
+             * int order_modelpk = order.getModelpk(); //人才pk int order_model_memberpk =
+             * modelInfoDao.getMemberpkByModelpk(order_modelpk);//模特的会员pk
+             */
+
+            int memberpk = order.getMemberpk();
+
+            // 订单付款，放到预付款金额里面
+            SystemPayConstants systemPayConstants = new SystemPayConstants();
+            boolean            pay_flag           = systemPayConstants.executeYuZhi_add(order_memberpk, order_coin);
+            if (pay_flag) {
+                //支付成功
+
+                String setState = OrderConstants.STATE_CODE_1; // 用户付款
+                // 当这个订单的状态为 这几个 时
+                String whereState_1 = OrderConstants.STATE_CODE_0;
+                int    rows         = orderRecordDao.updateOrderRecordSetStateMemberpk(orderpk, memberpk, setState, whereState_1);
+                if (rows > 0) {
+                    flag = true;
+                    modelInfoDao.updateModelSetHasRedByModel(order.getModelpk(), 1);
+                }
+            } else {
+                desc = "余额不足";
+            }
+
+        }
+        resultMap.put("flag", flag);
+        resultMap.put("orderstate", OrderConstants.getOrderState(orderRecordDao.findOrderRecordByPk(orderpk).getOrderstate()));
+        resultMap.put("desc", desc);
+
+        return resultMap;
+    }
+
+    @Override
+    public Map<String, Object> cancelOrder(int orderpk) {
+        Map<String, Object> resultMap  = new HashMap<String, Object>();
+        boolean             flag       = false;
+        String              orderstate = "";
+        if (orderpk > 0) {
+            // 获取当前订单信息
+            OrderRecord order = orderRecordDao.findOrderRecordByPk(orderpk);
+
+            int    memberpk   = order.getMemberpk();
+            double order_coin = order.getCoin();
+            String setState   = OrderConstants.STATE_CODE_2;// 未付款状态
+
+            // 当订单状态为一下几种状态 时 可以取消订单
+            String whereState_0 = OrderConstants.STATE_CODE_0;//未付款
+
+
+            int rows = orderRecordDao.updateOrderRecordSetStateMemberpk(orderpk, memberpk, setState, whereState_0);
+            if (rows > 0) {
+                flag = true;
+
+                //把订单里面的钱返还给用户   扣除手续费
+                //updateMemberCoinOToCoinA_Disable()
+                //memberinfoDao.updateMemberCoinOToCoinA(memberpk, order_coin, plus_coin_a);
+
+                SystemPayConstants sysPay = new SystemPayConstants();
+                sysPay.executeYuZhi_minus(memberpk, order_coin);
+
+            }
+        }
+        orderstate = OrderConstants.getOrderState(orderRecordDao.findOrderRecordByPk(orderpk).getOrderstate());
+        resultMap.put("flag", flag);
+        resultMap.put("orderstate", orderstate);
+
+        return resultMap;
+    }
+
+    @Override
+    public Map<String, Object> settlementOrder(int orderpk) {
+        Map<String, Object> resultMap = new HashMap<>();
+        boolean             flag      = false;
+        String              desc      = "";
+        // 获取当前订单信息
+        OrderRecord order = orderRecordDao.findOrderRecordByPk(orderpk);
+
+        //判断时间是否到订单结束时间？
+        boolean isEndTime = orderRecordDao.isOrderEndTime(order.getPk());
+        if (isEndTime) {
+            if (orderpk > 0) {
+                int accflag = order.getAccflag();
+                //可以结算
+                if (accflag == 1) {
+                    int memberpk = order.getMemberpk();
+
+                    String setState     = OrderConstants.STATE_CODE_5;// 订单结算
+                    String whereState_3 = OrderConstants.STATE_CODE_3;
+
+                    SystemPayConstants sysPay = new SystemPayConstants();
+                    ResultProcedure    rp     = sysPay.procedure(SystemPayConstants.PROCEDURE_TABLENAME_ORDERRECORD, orderpk);
 					/*
 					//订单金额
 					double order_coin = order.getCoin();
@@ -302,38 +300,37 @@ public class OrderServiceImpl implements OrderService {
 					ar2.setAbs("订单支出记录");
 					sysPay.insertAccountRecord(ar2);
 					*/
-					if(rp.getResult() == 0) {
-						int rows = orderRecordDao.updateOrderRecordSetStateMemberpk(orderpk, memberpk, setState, whereState_3);
-						if (rows > 0) {
-							flag = true;
-							desc = "结算成功";
-						} else {
-							desc = "结算失败,数据异常";
-						}
-					} else {
-						desc = rp.getMessage();
-					}
-				} else {
-					desc = "结算失败,状态异常";
-				}
-			}
-		} else {
-			desc = "未到订单结束时间";
-		}
-		resultMap.put("flag", flag);
-		resultMap.put("desc", desc);
-		return resultMap;
-	}
-
-	@Override
-	public Map getOrderInfo(int orderpk) {
-		if(orderpk > 0) {
-			return orderRecordDao.getOrderInfo(orderpk);
-		} else {
-			return null;
-		}
-	}
-
-	
+                    if (rp.getResult() == 0) {
+                        int rows = orderRecordDao.updateOrderRecordSetStateMemberpk(orderpk, memberpk, setState, whereState_3);
+                        if (rows > 0) {
+                            flag = true;
+                            desc = "结算成功";
+                        } else {
+                            desc = "结算失败,数据异常";
+                        }
+                    } else {
+                        desc = rp.getMessage();
+                    }
+                } else {
+                    desc = "结算失败,状态异常";
+                }
+            }
+        } else {
+            desc = "未到订单结束时间";
+        }
+        resultMap.put("flag", flag);
+        resultMap.put("desc", desc);
+        return resultMap;
+    }
+
+    @Override
+    public Map getOrderInfo(int orderpk) {
+        if (orderpk > 0) {
+            return orderRecordDao.getOrderInfo(orderpk);
+        } else {
+            return null;
+        }
+    }
+
 
 }

src/main/java/com/thmodel/servlet/OrderServlet.java

@@ -37,84 +37,84 @@ import com.thmodel.vo.OrderParam;
 
 /**
  * 订单接口请求名：order
+ *
  * @author 刘迎奥
  * @version v1.0
  */
 public class OrderServlet extends HttpServlet {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private static OrderService orderService = new OrderServiceImpl();
-	private static VideoRecordService videoRecordService = new VideoRecordServiceImpl();
-	private static ModelInfoDao modelInfoDao = new ModelInfoDaoImpl();
-	public void doGet(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
-		doPost(request, response);
-	}
-	
-	public void doPost(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
-		// 支持跨域
-		response.setHeader("Access-Control-Allow-Origin", "*");
-		
-		response.setContentType("text/html; charset=UTF-8");
-		request.setCharacterEncoding("UTF-8");
-		
-		String action = request.getParameter("action") == null ? "" : request.getParameter("action").toLowerCase();
-		
-		JSONObject resultJson = new JSONObject();
-		try {
-			
-			//9 订单
-			//http://localhost:8080/thmodel/order?action=doputorder&PK=1&ModelPK=2&BrokerPK=3&LederPK=0&ODate=2018-06-28&SDate=2018-06-28&SCount=4&SName=阿萨德&SPrice=29&coin=29&OrderState=0&intro=asdsafaasdfa&skillpk=1&linkman=liuyingao&linkphone=15856985698&addr=阿斯蒂芬
-			if(action.equals("doputorder")){
-				String memberpk = CommentUtils.myToString(request.getParameter("PK"));			//会员PK
-				String modelpk = CommentUtils.myToString(request.getParameter("ModelPK"));		//人才PK
-				String brokerpk = CommentUtils.myToString(request.getParameter("BrokerPK"));	//经纪人PK
-				String lederpk = CommentUtils.myToString(request.getParameter("LederPK"));		//队长PK
-				//String odate = CommentUtils.myToString(request.getParameter("ODate"));			//订单日期
-				String odate = MyDateUtil.format(new Date(), MyDateUtil.DATE_FORMAT_1);			//订单日期
-				String sdate = CommentUtils.myToString(request.getParameter("SDate"));			//服务日期时间
-				String scount = CommentUtils.myToString(request.getParameter("SCount"));		//服务时长
-				String sname = CommentUtils.myToString(request.getParameter("SName"));			//服务名称
-				String sprice = CommentUtils.myToString(request.getParameter("SPrice"));		//价格
-				String coin = CommentUtils.myToString(request.getParameter("coin"));			//支付费用
-				//String orderstate = CommentUtils.myToString(request.getParameter("OrderState"));//订单状态
-				String orderstate = OrderConstants.STATE_CODE_0;
-				
-				String intro = CommentUtils.myToString(request.getParameter("intro"));			//订单说明
-				
-				String skillpk = CommentUtils.myToString(request.getParameter("skillpk"));		//技能标签PK
-				String linkman = CommentUtils.myToString(request.getParameter("linkman"));		//联系人
-				String linkphone = CommentUtils.myToString(request.getParameter("linkphone"));	//联系方式
-				String addr = CommentUtils.myToString(request.getParameter("addr"));			//工作地点
-				
-				scount = scount.replaceAll("小时", "");
-				
-				OrderParam op = new OrderParam(memberpk, modelpk, brokerpk, lederpk, odate, sdate, scount, sname, sprice, coin, orderstate, intro, skillpk, linkman, linkphone, addr);
-				
-				int pk = orderService.putOrder(op);
-				if(pk > 0){
-					int model_memberpk = modelInfoDao.getMemberpkByModelpk(Integer.parseInt(modelpk));
-					resultJson.put("msg", Constants.success);
-					resultJson.put("orderpk", pk);
-					resultJson.put("model_memberpk", model_memberpk);
-				}else{
-					resultJson.put("msg", Constants.fail);
-				}
-				
-			}
-			
-			//9.1  用户端：获取订单
-			else if(action.equalsIgnoreCase("dogetorder")){
-				int memberPk = Integer.parseInt(CommentUtils.myToString(request.getParameter("pk")));//会员PK
-				String state = CommentUtils.myToString(request.getParameter("state"));//订单状态
-				
-				int index = CommentUtils.myToInt(request.getParameter("index"));
-				int size = CommentUtils.myToInt(request.getParameter("size")) ;
-				
-				index = index == 0 ? 1 : index;
-				size = size == 0 ? 10 : size;
+
+    private static final long serialVersionUID = 1L;
+
+    private static OrderService       orderService       = new OrderServiceImpl();
+    private static VideoRecordService videoRecordService = new VideoRecordServiceImpl();
+    private static ModelInfoDao       modelInfoDao       = new ModelInfoDaoImpl();
+
+    public void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        doPost(request, response);
+    }
+
+    public void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        // 支持跨域
+        response.setHeader("Access-Control-Allow-Origin", "*");
+
+        response.setContentType("text/html; charset=UTF-8");
+        request.setCharacterEncoding("UTF-8");
+
+        String action = request.getParameter("action") == null ? "" : request.getParameter("action").toLowerCase();
+
+        JSONObject resultJson = new JSONObject();
+        try {
+
+            //9 订单
+            //http://localhost:8080/thmodel/order?action=doputorder&PK=1&ModelPK=2&BrokerPK=3&LederPK=0&ODate=2018-06-28&SDate=2018-06-28&SCount=4&SName=阿萨德&SPrice=29&coin=29&OrderState=0&intro=asdsafaasdfa&skillpk=1&linkman=liuyingao&linkphone=15856985698&addr=阿斯蒂芬
+            if (action.equals("doputorder")) {
+                String memberpk = CommentUtils.myToString(request.getParameter("PK"));          //会员PK
+                String modelpk  = CommentUtils.myToString(request.getParameter("ModelPK"));     //人才PK
+                String brokerpk = CommentUtils.myToString(request.getParameter("BrokerPK"));    //经纪人PK
+                String lederpk  = CommentUtils.myToString(request.getParameter("LederPK"));     //队长PK
+                //String odate = CommentUtils.myToString(request.getParameter("ODate"));           //订单日期
+                String odate  = MyDateUtil.format(new Date(), MyDateUtil.DATE_FORMAT_1);           //订单日期
+                String sdate  = CommentUtils.myToString(request.getParameter("SDate"));         //服务日期时间
+                String scount = CommentUtils.myToString(request.getParameter("SCount"));        //服务时长
+                String sname  = CommentUtils.myToString(request.getParameter("SName"));         //服务名称
+                String sprice = CommentUtils.myToString(request.getParameter("SPrice"));        //价格
+                String coin   = CommentUtils.myToString(request.getParameter("coin"));          //支付费用
+                //String orderstate = CommentUtils.myToString(request.getParameter("OrderState")); //订单状态
+                String orderstate = OrderConstants.STATE_CODE_0;
+                String intro      = CommentUtils.myToString(request.getParameter("intro"));     //订单说明
+                String skillpk    = CommentUtils.myToString(request.getParameter("skillpk"));   //技能标签PK
+                String linkman    = CommentUtils.myToString(request.getParameter("linkman"));   //联系人
+                String linkphone  = CommentUtils.myToString(request.getParameter("linkphone")); //联系方式
+                String addr       = CommentUtils.myToString(request.getParameter("addr"));      //工作地点
+
+                scount = scount.replaceAll("小时", "");
+
+                OrderParam op = new OrderParam(memberpk, modelpk, brokerpk, lederpk, odate, sdate, scount, sname, sprice, coin, orderstate, intro, skillpk, linkman, linkphone, addr);
+
+                int pk = orderService.putOrder(op);
+                if (pk > 0) {
+                    int model_memberpk = modelInfoDao.getMemberpkByModelpk(Integer.parseInt(modelpk));
+                    resultJson.put("msg", Constants.success);
+                    resultJson.put("orderpk", pk);
+                    resultJson.put("model_memberpk", model_memberpk);
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+
+            }
+
+            //9.1  用户端：获取订单
+            else if (action.equalsIgnoreCase("dogetorder")) {
+                int    memberPk = Integer.parseInt(CommentUtils.myToString(request.getParameter("pk"))); //会员PK
+                String state    = CommentUtils.myToString(request.getParameter("state"));                //订单状态
+
+                int index = CommentUtils.myToInt(request.getParameter("index"));
+                int size  = CommentUtils.myToInt(request.getParameter("size"));
+
+                index = index == 0 ? 1 : index;
+                size = size == 0 ? 10 : size;
 				/*
 					all：全部订单
 					1：待付款
@@ -122,36 +122,35 @@ public class OrderServlet extends HttpServlet {
 					3：已完成
 					4：取消（用户取消/模特取消）
 				*/
-				
-				if(state.equals("all") || state.equals("1") || state.equals("2") || state.equals("3") || state.equals("4")) {
-					Page page = orderService.getOrder(memberPk, state, index, size);
-					
-					if(page != null){
-						
-						int count = page.getCount();
-						List<Map<String, Object>> list = (List<Map<String, Object>>) page.getData();
-						
-						resultJson.put("msg", Constants.success);
-						resultJson.put("data", JsonUtils.tofastjson(list));
-						resultJson.put("count", JsonUtils.tofastjson(count));
-					} else {
-						resultJson.put("msg", Constants.fail);
-					}
-				} else {
-					resultJson.put("msg", Constants.error);
-				}
-			}
-			
-			//模特端： 获取订单
-			else if(action.equalsIgnoreCase("dogetmodelorder")) {
-				int modelpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("modelpk")));//会员PK
-				String state = CommentUtils.myToString(request.getParameter("state"));//订单状态
-				
-				int index = CommentUtils.myToInt(request.getParameter("index"));
-				int size = CommentUtils.myToInt(request.getParameter("size")) ;
-				
-				index = index == 0 ? 1 : index;
-				size = size == 0 ? 10 : size;
+                if (state.equals("all") || state.equals("1") || state.equals("2") || state.equals("3") || state.equals("4")) {
+                    Page page = orderService.getOrder(memberPk, state, index, size);
+
+                    if (page != null) {
+
+                        int                       count = page.getCount();
+                        List<Map<String, Object>> list  = (List<Map<String, Object>>) page.getData();
+
+                        resultJson.put("msg", Constants.success);
+                        resultJson.put("data", JsonUtils.tofastjson(list));
+                        resultJson.put("count", JsonUtils.tofastjson(count));
+                    } else {
+                        resultJson.put("msg", Constants.fail);
+                    }
+                } else {
+                    resultJson.put("msg", Constants.error);
+                }
+            }
+
+            //模特端： 获取订单
+            else if (action.equalsIgnoreCase("dogetmodelorder")) {
+                int    modelpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("modelpk")));//会员PK
+                String state   = CommentUtils.myToString(request.getParameter("state"));//订单状态
+
+                int index = CommentUtils.myToInt(request.getParameter("index"));
+                int size  = CommentUtils.myToInt(request.getParameter("size"));
+
+                index = index == 0 ? 1 : index;
+                size = size == 0 ? 10 : size;
 				
 				/*
 					all：全部订单
@@ -159,277 +158,276 @@ public class OrderServlet extends HttpServlet {
 					2：进行中
 					3：已完成
 				*/
-				if(state.equals("all") || state.equals("1") || state.equals("2") || state.equals("3")) {
-					Page page = orderService.getModelOrder(modelpk, state, index, size);
-
-					if(page != null){
-						resultJson.put("msg", Constants.success);
-						
-						int count = page.getCount();
-						List<Map<String, Object>> list = (List<Map<String, Object>>) page.getData();
-						resultJson.put("count", JsonUtils.tofastjson(count));
-						resultJson.put("data", JsonUtils.tofastjson(list));
-					} else {
-						resultJson.put("msg", Constants.fail);
-					}
-				} else {
-					resultJson.put("msg", Constants.error);
-				}
-			}
-				
-			
-			//查看订单详情
-			else if(action.equalsIgnoreCase("doGetOrderInfo")) {
-				int orderpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));//订单PK
-				
-				Map map = orderService.getOrderInfo(orderpk);
-				if(map != null) {
-					resultJson.put("msg", Constants.success);
-					resultJson.put("data", JsonUtils.tofastjson(map));
-				}else {
-					resultJson.put("msg", Constants.fail);
-				}
-			}
-			
-			//9.2订单评价
-			else if(action.equalsIgnoreCase("doecorder")){
-				
-				int orderPk = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));//订单PK
-				String ec = CommentUtils.myToString(request.getParameter("ec"));//客户评价
-				String evaluate = CommentUtils.myToString(request.getParameter("evaluate"));//评价说明
-				boolean flag = orderService.ecorder(orderPk, ec, evaluate);
-				if(flag){
-					resultJson.put("msg", Constants.success);
-				}else{
-					resultJson.put("msg", Constants.fail);
-				}
-				
-			}
-			
-			//6.获取视频订单 -模特端
-			else if(action.equalsIgnoreCase("getvideorecordorder")) {
-				int modelpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("modelpk")));
-				
-				int index = CommentUtils.myToInt(request.getParameter("index"));
-				int size = CommentUtils.myToInt(request.getParameter("size")) ;
-				
-				index = index == 0 ? 1 : index;
-				size = size == 0 ? 10 : size;
-				
-				Page<List<Map<String, Object>>> page = videoRecordService.getVideoRecordOrderList(modelpk, index, size);
-				List<Map<String, Object>> list = page.getData();
-				int count = page.getCount();
-				if(list != null) {
-					resultJson.put("msg", Constants.success);
-					resultJson.put("count", count);
-					resultJson.put("data", JsonUtils.tofastjson(list));
-				} else {
-					resultJson.put("msg", Constants.fail);
-				}
-			}
-			
-			//获取客户端  视屏订单列表
-			else if (action.equalsIgnoreCase("getMemberVideoRecordOrder")) {
-				int memberpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("memberpk")));
-				int index = CommentUtils.myToInt(request.getParameter("index"));
-				int size = CommentUtils.myToInt(request.getParameter("size")) ;
-				
-				index = index == 0 ? 1 : index;
-				size = size == 0 ? 10 : size;
-				
-				Page<List<Map<String, Object>>> page = videoRecordService.getMemberVideoRecordOrderList(memberpk, index, size);
-				List<Map<String, Object>> list = page.getData();
-				int count = page.getCount();
-				if(list != null) {
-					resultJson.put("msg", Constants.success);
-					resultJson.put("count", count);
-					resultJson.put("data", JsonUtils.tofastjson(list));
-				} else {
-					resultJson.put("msg", Constants.fail);
-				}
-			}
-			
-			//模特 取消 订单
-			else if (action.equals("cancelordermodel")) {
-				int orderpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));
-				int modelpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("modelpk")));
-				boolean flag = orderService.cancelOrderModel(orderpk, modelpk);
-				if(flag){
-					resultJson.put("msg", Constants.success);
-				}else{
-					resultJson.put("msg", Constants.fail);
-				}
-			}
-			
-			//模特 确定 订单
-			else if(action.equals("confirmordermodel")) {
-				int orderpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));
-				int modelpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("modelpk")));
-				boolean flag = orderService.confirMorderModel(orderpk, modelpk);
-				if(flag){
-					resultJson.put("msg", Constants.success);
-				}else{
-					resultJson.put("msg", Constants.fail);
-				}
-			}
-			//9.3 会员 支付 订单
-			else if(action.equals("domemberpayorder")) {
-				int orderpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));
-				Map<String, Object> map = orderService.payOrder(orderpk);
-				
-				boolean flag = (boolean) map.get("flag");
-				String orderstate = (String) map.get("orderstate");
-				String desc = (String) map.get("desc");
-				if (flag) {
-					
-					resultJson.put("msg", Constants.success);
-				} else {
-					resultJson.put("msg", Constants.fail);
-				}
-				resultJson.put("orderstate", orderstate);
-				resultJson.put("desc", desc);
-			}
-			
-			//9.4 会员 取消 订单
-			else if(action.equals("domembercancelorder")) {
-				
-				int orderpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));
-				
-				Map<String, Object> map = orderService.cancelOrder(orderpk);
-				
-				boolean flag = (boolean) map.get("flag");
-				String orderstate = (String) map.get("orderstate");
-				resultJson.put("orderstate", orderstate);
-				if(flag){
-					resultJson.put("msg", Constants.success);
-				}else{
-					resultJson.put("msg", Constants.fail);
-				}
-			}
-			
-			//模特 ->订单结算
-			else if(action.equals("dosettlementorder")) {
-				//订单pk
-				int orderpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));
-				
-				Map<String, Object> resultMap = orderService.settlementOrder(orderpk);
-				String desc = (String)resultMap.get("desc");
-				boolean flag = (boolean)resultMap.get("flag");
-				
-				if(flag){
-					resultJson.put("msg", Constants.success);
-				}else{
-					resultJson.put("msg", Constants.fail);
-				}
-				resultJson.put("desc", desc);
-			}
-			
-			
-			//6视频聊天
-			else if(action.equals("dobegvchat")){
-				int pk = Integer.parseInt(CommentUtils.myToString(request.getParameter("pk")));//会员PK
-				int modelPK = Integer.parseInt(CommentUtils.myToString(request.getParameter("modelpk")));//人才PK
-				String begDate = CommentUtils.myToString(request.getParameter("begdate"));//开始时间
-				int hasAnswer = Integer.parseInt(CommentUtils.myToString(request.getParameter("hasanswer")));//是否接听
-				
-				int videopk = videoRecordService.begVChat(pk, modelPK, begDate, hasAnswer);
-				if(videopk > 0){
-					resultJson.put("msg", Constants.success);
-					resultJson.put("videopk", videopk + "");
-				}else{
-					resultJson.put("msg", Constants.fail);
-				}
-			}
-			
-			//6.1接听聊天
-			if(action.equals("doansvchat")){
-				//暂时没用
-				int videoPk = Integer.parseInt(CommentUtils.myToString(request.getParameter("videopk")));	//视频PK	为0表示一发起就接听
-				
-				int memberPk = Integer.parseInt(CommentUtils.myToString(request.getParameter("pk")));		//会员PK
-				int modelPk = Integer.parseInt(CommentUtils.myToString(request.getParameter("modelpk")));	//人才PK
-				String begDate = CommentUtils.myToString(request.getParameter("begdate"));					//开始时间
-				int hasAnswer = Integer.parseInt(CommentUtils.myToString(request.getParameter("hasanswer")));//是否接听
-				
-				int videopk = videoRecordService.ansVChat(videoPk, memberPk, modelPk, begDate, hasAnswer);
-				if(videopk > 0){
-					resultJson.put("msg", Constants.success);
-					resultJson.put("videopk", videopk+"");
-				}else{
-					resultJson.put("msg", Constants.fail);
-				}
-			}
-			
-			//6.2视频聊天结束
-			else if(action.equals("doendvchat")){
-				int videopk = Integer.parseInt(CommentUtils.myToString(request.getParameter("videopk")));//视频PK
-				String duration = CommentUtils.myToString(request.getParameter("duration"));//时长
-				
-				//获取订单信息
-				VideoRecordDao videoRecordDao = new VideoRecordDaoImpl();
-				VideoRecord videoOrder = videoRecordDao.findVideoRecordByPk(videopk);
-				
-				//获取订单的人才信息
-				ModelInfoDao modelInfoDao = new ModelInfoDaoImpl();
-				ModelInfo modelInfo = modelInfoDao.findModelByPk(videoOrder.getModelpk());
-				
-				//获取订单人才的会员信息
-				MemberinfoDao  memberinfoDao = new MemberinfoDaoImpl();
-				MemberInfo memberinfo = memberinfoDao.findMemberinfoByPK(modelInfo.getMemberpk());
-				
-				double coin = Double.parseDouble(duration) * modelInfo.getVprice();
-				
-				
-				boolean flag = videoRecordService.endVChat(videopk, duration, coin);
-				if(flag){
-					resultJson.put("msg", Constants.success);
-				}else{
-					resultJson.put("msg", Constants.fail);
-				}
-			}
-			
-			//6.3视频聊天费用探测
-			else if(action.equals("dovchattest")){
-				int videopk = Integer.parseInt(CommentUtils.myToString(request.getParameter("videopk")));//视频PK
-				String duration = CommentUtils.myToString(request.getParameter("duration"));//时长
-				
-				//获取订单信息
-				VideoRecordDao videoRecordDao = new VideoRecordDaoImpl();
-				VideoRecord videoOrder = videoRecordDao.findVideoRecordByPk(videopk);
-				
-				//获取订单的人才信息
-				ModelInfoDao modelInfoDao = new ModelInfoDaoImpl();
-				ModelInfo modelInfo = modelInfoDao.findModelByPk(videoOrder.getModelpk());
-				
-				
-				
-				double coin = Double.parseDouble(duration) * modelInfo.getVprice();
-				
-				boolean flag = videoRecordService.endVChat(videopk, duration, coin);
-				if(flag){
-					resultJson.put("msg", Constants.success);
-					
-					resultJson.put("coin", coin);
-					
-					//获取订单会员信息
-					MemberinfoDao  memberinfoDao = new MemberinfoDaoImpl();
-					MemberInfo memberinfo = memberinfoDao.findMemberinfoByPK(videoOrder.getMemberpk());
-					resultJson.put("coinfee", memberinfo.getCoin_a());
-				}else{
-					resultJson.put("msg", Constants.fail);
-				}
-			}
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-			resultJson.put("msg", Constants.error);
-		} finally{
-			if(action.equals("")){
-				resultJson.put("msg", Constants.error);
-				resultJson.put("desc", "参数action不能为空!");
-			}
-			JsonUtils.printWriter(response, resultJson);
-		}
-	}
+                if (state.equals("all") || state.equals("1") || state.equals("2") || state.equals("3")) {
+                    Page page = orderService.getModelOrder(modelpk, state, index, size);
+
+                    if (page != null) {
+                        resultJson.put("msg", Constants.success);
+
+                        int                       count = page.getCount();
+                        List<Map<String, Object>> list  = (List<Map<String, Object>>) page.getData();
+                        resultJson.put("count", JsonUtils.tofastjson(count));
+                        resultJson.put("data", JsonUtils.tofastjson(list));
+                    } else {
+                        resultJson.put("msg", Constants.fail);
+                    }
+                } else {
+                    resultJson.put("msg", Constants.error);
+                }
+            }
+
+
+            //查看订单详情
+            else if (action.equalsIgnoreCase("doGetOrderInfo")) {
+                int orderpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));//订单PK
+
+                Map map = orderService.getOrderInfo(orderpk);
+                if (map != null) {
+                    resultJson.put("msg", Constants.success);
+                    resultJson.put("data", JsonUtils.tofastjson(map));
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+            }
+
+            //9.2订单评价
+            else if (action.equalsIgnoreCase("doecorder")) {
+
+                int     orderPk  = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));//订单PK
+                String  ec       = CommentUtils.myToString(request.getParameter("ec"));//客户评价
+                String  evaluate = CommentUtils.myToString(request.getParameter("evaluate"));//评价说明
+                boolean flag     = orderService.ecorder(orderPk, ec, evaluate);
+                if (flag) {
+                    resultJson.put("msg", Constants.success);
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+
+            }
+
+            //6.获取视频订单 -模特端
+            else if (action.equalsIgnoreCase("getvideorecordorder")) {
+                int modelpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("modelpk")));
+
+                int index = CommentUtils.myToInt(request.getParameter("index"));
+                int size  = CommentUtils.myToInt(request.getParameter("size"));
+
+                index = index == 0 ? 1 : index;
+                size = size == 0 ? 10 : size;
+
+                Page<List<Map<String, Object>>> page  = videoRecordService.getVideoRecordOrderList(modelpk, index, size);
+                List<Map<String, Object>>       list  = page.getData();
+                int                             count = page.getCount();
+                if (list != null) {
+                    resultJson.put("msg", Constants.success);
+                    resultJson.put("count", count);
+                    resultJson.put("data", JsonUtils.tofastjson(list));
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+            }
+
+            //获取客户端  视屏订单列表
+            else if (action.equalsIgnoreCase("getMemberVideoRecordOrder")) {
+                int memberpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("memberpk")));
+                int index    = CommentUtils.myToInt(request.getParameter("index"));
+                int size     = CommentUtils.myToInt(request.getParameter("size"));
+
+                index = index == 0 ? 1 : index;
+                size = size == 0 ? 10 : size;
+
+                Page<List<Map<String, Object>>> page  = videoRecordService.getMemberVideoRecordOrderList(memberpk, index, size);
+                List<Map<String, Object>>       list  = page.getData();
+                int                             count = page.getCount();
+                if (list != null) {
+                    resultJson.put("msg", Constants.success);
+                    resultJson.put("count", count);
+                    resultJson.put("data", JsonUtils.tofastjson(list));
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+            }
+
+            //模特 取消 订单
+            else if (action.equals("cancelordermodel")) {
+                int     orderpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));
+                int     modelpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("modelpk")));
+                boolean flag    = orderService.cancelOrderModel(orderpk, modelpk);
+                if (flag) {
+                    resultJson.put("msg", Constants.success);
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+            }
+
+            //模特 确定 订单
+            else if (action.equals("confirmordermodel")) {
+                int     orderpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));
+                int     modelpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("modelpk")));
+                boolean flag    = orderService.confirMorderModel(orderpk, modelpk);
+                if (flag) {
+                    resultJson.put("msg", Constants.success);
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+            }
+            //9.3 会员 支付 订单
+            else if (action.equals("domemberpayorder")) {
+                int                 orderpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));
+                Map<String, Object> map     = orderService.payOrder(orderpk);
+
+                boolean flag       = (boolean) map.get("flag");
+                String  orderstate = (String) map.get("orderstate");
+                String  desc       = (String) map.get("desc");
+                if (flag) {
+
+                    resultJson.put("msg", Constants.success);
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+                resultJson.put("orderstate", orderstate);
+                resultJson.put("desc", desc);
+            }
+
+            //9.4 会员 取消 订单
+            else if (action.equals("domembercancelorder")) {
+
+                int orderpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));
+
+                Map<String, Object> map = orderService.cancelOrder(orderpk);
+
+                boolean flag       = (boolean) map.get("flag");
+                String  orderstate = (String) map.get("orderstate");
+                resultJson.put("orderstate", orderstate);
+                if (flag) {
+                    resultJson.put("msg", Constants.success);
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+            }
+
+            //模特 ->订单结算
+            else if (action.equals("dosettlementorder")) {
+                //订单pk
+                int orderpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("orderpk")));
+
+                Map<String, Object> resultMap = orderService.settlementOrder(orderpk);
+                String              desc      = (String) resultMap.get("desc");
+                boolean             flag      = (boolean) resultMap.get("flag");
+
+                if (flag) {
+                    resultJson.put("msg", Constants.success);
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+                resultJson.put("desc", desc);
+            }
+
+
+            //6视频聊天
+            else if (action.equals("dobegvchat")) {
+                int    pk        = Integer.parseInt(CommentUtils.myToString(request.getParameter("pk")));//会员PK
+                int    modelPK   = Integer.parseInt(CommentUtils.myToString(request.getParameter("modelpk")));//人才PK
+                String begDate   = CommentUtils.myToString(request.getParameter("begdate"));//开始时间
+                int    hasAnswer = Integer.parseInt(CommentUtils.myToString(request.getParameter("hasanswer")));//是否接听
+
+                int videopk = videoRecordService.begVChat(pk, modelPK, begDate, hasAnswer);
+                if (videopk > 0) {
+                    resultJson.put("msg", Constants.success);
+                    resultJson.put("videopk", videopk + "");
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+            }
+
+            //6.1接听聊天
+            if (action.equals("doansvchat")) {
+                //暂时没用
+                int videoPk = Integer.parseInt(CommentUtils.myToString(request.getParameter("videopk")));    //视频PK	为0表示一发起就接听
+
+                int    memberPk  = Integer.parseInt(CommentUtils.myToString(request.getParameter("pk")));        //会员PK
+                int    modelPk   = Integer.parseInt(CommentUtils.myToString(request.getParameter("modelpk")));    //人才PK
+                String begDate   = CommentUtils.myToString(request.getParameter("begdate"));                    //开始时间
+                int    hasAnswer = Integer.parseInt(CommentUtils.myToString(request.getParameter("hasanswer")));//是否接听
+
+                int videopk = videoRecordService.ansVChat(videoPk, memberPk, modelPk, begDate, hasAnswer);
+                if (videopk > 0) {
+                    resultJson.put("msg", Constants.success);
+                    resultJson.put("videopk", videopk + "");
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+            }
+
+            //6.2视频聊天结束
+            else if (action.equals("doendvchat")) {
+                int    videopk  = Integer.parseInt(CommentUtils.myToString(request.getParameter("videopk")));//视频PK
+                String duration = CommentUtils.myToString(request.getParameter("duration"));//时长
+
+                //获取订单信息
+                VideoRecordDao videoRecordDao = new VideoRecordDaoImpl();
+                VideoRecord    videoOrder     = videoRecordDao.findVideoRecordByPk(videopk);
+
+                //获取订单的人才信息
+                ModelInfoDao modelInfoDao = new ModelInfoDaoImpl();
+                ModelInfo    modelInfo    = modelInfoDao.findModelByPk(videoOrder.getModelpk());
+
+                //获取订单人才的会员信息
+                MemberinfoDao memberinfoDao = new MemberinfoDaoImpl();
+                MemberInfo    memberinfo    = memberinfoDao.findMemberinfoByPK(modelInfo.getMemberpk());
+
+                double coin = Double.parseDouble(duration) * modelInfo.getVprice();
+
+
+                boolean flag = videoRecordService.endVChat(videopk, duration, coin);
+                if (flag) {
+                    resultJson.put("msg", Constants.success);
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+            }
+
+            //6.3视频聊天费用探测
+            else if (action.equals("dovchattest")) {
+                int    videopk  = Integer.parseInt(CommentUtils.myToString(request.getParameter("videopk")));//视频PK
+                String duration = CommentUtils.myToString(request.getParameter("duration"));//时长
+
+                //获取订单信息
+                VideoRecordDao videoRecordDao = new VideoRecordDaoImpl();
+                VideoRecord    videoOrder     = videoRecordDao.findVideoRecordByPk(videopk);
+
+                //获取订单的人才信息
+                ModelInfoDao modelInfoDao = new ModelInfoDaoImpl();
+                ModelInfo    modelInfo    = modelInfoDao.findModelByPk(videoOrder.getModelpk());
+
+
+                double coin = Double.parseDouble(duration) * modelInfo.getVprice();
+
+                boolean flag = videoRecordService.endVChat(videopk, duration, coin);
+                if (flag) {
+                    resultJson.put("msg", Constants.success);
+
+                    resultJson.put("coin", coin);
+
+                    //获取订单会员信息
+                    MemberinfoDao memberinfoDao = new MemberinfoDaoImpl();
+                    MemberInfo    memberinfo    = memberinfoDao.findMemberinfoByPK(videoOrder.getMemberpk());
+                    resultJson.put("coinfee", memberinfo.getCoin_a());
+                } else {
+                    resultJson.put("msg", Constants.fail);
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultJson.put("msg", Constants.error);
+        } finally {
+            if (action.equals("")) {
+                resultJson.put("msg", Constants.error);
+                resultJson.put("desc", "参数action不能为空!");
+            }
+            JsonUtils.printWriter(response, resultJson);
+        }
+    }
 
 }