crud

src/main/java/com/ygj/yuemum/controller/equipment/EquipmentInfoController.java

@@ -63,4 +63,8 @@ public class EquipmentInfoController {
     public int checkEquipmentInfo(@RequestParam("ei_code") String ei_code) {
         return equipmentInfoService.checkEquipmentInfo(ei_code);
     }
+    @GetMapping("/checkEquipmentHire")
+    public int checkEquipmentHire(@RequestParam("ei_code") String ei_code) {
+        return equipmentInfoService.checkEquipmentHire(ei_code);
+    }
 }

src/main/java/com/ygj/yuemum/controller/equipment/EquipmentReturnController.java

@@ -0,0 +1,27 @@
+package com.ygj.yuemum.controller.equipment;
+
+
+import com.ygj.yuemum.domain.equipment.EquipmentReturn;
+import com.ygj.yuemum.service.equipment.EquipmentReturnService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+public class EquipmentReturnController {
+
+    @Autowired
+    private EquipmentReturnService equipmentReturnService;
+    @GetMapping("/selectEquipmentReturn")
+    public List<EquipmentReturn> selectEquipmentReturn(@RequestParam("eh_code") String eh_code) {
+        List<EquipmentReturn> equipmentReturns = equipmentReturnService.selectEquipmentReturn(eh_code);
+        return equipmentReturns;
+    }
+
+    @PostMapping("/insertEquipmentReturn")
+    public int insertEquipmentReturn(@ModelAttribute EquipmentReturn equipmentReturn) {
+        return  equipmentReturnService.insertEquipmentReturn(equipmentReturn);
+    }
+
+}

src/main/java/com/ygj/yuemum/controller/equipment/EquipmentTypeController.java

@@ -5,6 +5,7 @@ import com.ygj.yuemum.domain.equipment.EquipmentType;
 import com.ygj.yuemum.service.equipment.EquipmentTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -19,4 +20,10 @@ public class EquipmentTypeController {
         List<EquipmentType> equipmentTypes = equipmentTypeService.getEquipmentTypes();
         return equipmentTypes;
     }
+    @GetMapping("/getEquipmentAmount")
+    public EquipmentType getEquipmentAmount(@RequestParam("et_type") Integer et_type) {
+        EquipmentType equipmentType= equipmentTypeService.getEquipmentAmount(et_type);
+        return equipmentType;
+    }
+
 }

src/main/java/com/ygj/yuemum/controller/equipment/EquipmenteHireDetailController.java

@@ -0,0 +1,53 @@
+package com.ygj.yuemum.controller.equipment;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.ygj.yuemum.domain.equipment.EquipmenteHireDetail;
+import com.ygj.yuemum.service.equipment.EquipmenteHireDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class EquipmenteHireDetailController {
+
+    @Autowired
+    private EquipmenteHireDetailService equipmenteHireDetailService;
+
+    @GetMapping("/getEquipmenteHireDetail")
+    public String getEquipmenteHireDetail(@RequestParam("page") Integer page,@RequestParam("limit") Integer limit) {
+        Map<String, Object> equipmentInfos= equipmenteHireDetailService.getEquipmenteHireDetails(page,limit);
+        String jso = JSONObject.toJSONString(equipmentInfos);
+        return jso;
+    }
+
+    @GetMapping("/getAllEquipmenteHireDetails")
+    public List<EquipmenteHireDetail> getAllEquipmenteHireHeads() {
+            return equipmenteHireDetailService.getAll();
+    }
+
+    @PostMapping("/addEquipmenteHireDetail")
+    public int addEquipmenteHireDetail(@ModelAttribute EquipmenteHireDetail equipmenteHireDetail) {
+        return equipmenteHireDetailService.addEquipmenteHireDetail(equipmenteHireDetail);
+    }
+
+    @GetMapping("/deleteEquipmenteHireDetail")
+    public int deleteEquipmenteHireDetail(@RequestParam("eh_code") String eh_code) {
+        return equipmenteHireDetailService.deleteEquipmenteHireDetail(eh_code);
+    }
+
+    @PostMapping("/updateEquipmenteHireDetail")
+    public int updateEquipmenteHireDetail(@ModelAttribute EquipmenteHireDetail equipmenteHireDetail) {
+        return equipmenteHireDetailService.updateEquipmenteHireDetail(equipmenteHireDetail);
+    }
+
+    @PostMapping("/queryEquipmenteHireDetail")
+    public String queryEquipmenteHireDetail(@ModelAttribute EquipmenteHireDetail equipmenteHireDetail) {
+        Map<String, Object> equipmenteHireHead1= equipmenteHireDetailService.queryEquipmenteHireDetail(equipmenteHireDetail);
+        String jso = JSONObject.toJSONString(equipmenteHireHead1);
+        return jso;
+    }
+
+}

src/main/java/com/ygj/yuemum/controller/equipment/EquipmenteHireHeadController.java

@@ -0,0 +1,54 @@
+package com.ygj.yuemum.controller.equipment;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.ygj.yuemum.domain.equipment.EquipmenteHireHead;
+import com.ygj.yuemum.service.equipment.EquipmenteHireHeadService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+public class EquipmenteHireHeadController {
+
+    @Autowired
+    private EquipmenteHireHeadService equipmenteHireHeadService;
+
+
+    @GetMapping("/getAllEquipmenteHireHeads")
+    public String getAllEquipmenteHireHeads(@RequestParam("page") Integer page,@RequestParam("limit") Integer limit) {
+        Map<String, Object> equipmenteHireHeadServiceAll = equipmenteHireHeadService.getAll(page,limit);
+        String jso = JSONObject.toJSONString(equipmenteHireHeadServiceAll);
+        return jso;
+    }
+
+    @PostMapping("/addEquipmenteHireHead")
+    public int addEquipmenteHireHead(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        return equipmenteHireHeadService.addEquipmenteHireHead(equipmenteHireHead);
+    }
+
+    @GetMapping("/deleteEquipmenteHireHead")
+    public int deleteEquipmenteHireHead(@RequestParam("eh_code") String eh_code) {
+        return equipmenteHireHeadService.deleteEquipmenteHireHead(eh_code);
+    }
+
+    @PostMapping("/updateEquipmenteHireHead")
+    public int updateEquipmenteHireHead(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        return equipmenteHireHeadService.updateEquipmenteHireHead(equipmenteHireHead);
+    }
+
+    @PostMapping("/queryEquipmenteHireHead")
+    public String queryEquipmenteHireHead(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        Map<String, Object> equipmenteHireHead1 = equipmenteHireHeadService.queryEquipmenteHireHead(equipmenteHireHead);
+        String jso = JSONObject.toJSONString(equipmenteHireHead1);
+        return jso;
+    }
+
+    @GetMapping("/getEquipmenteHireHead")
+    public EquipmenteHireHead getOne(@RequestParam("eh_code") String eh_code) {
+        EquipmenteHireHead equipmenteHireHead = equipmenteHireHeadService.getEquipmenteHireHead(eh_code);
+        return equipmenteHireHead;
+    }
+
+}

src/main/java/com/ygj/yuemum/controller/pay/CustomerPayController.java

@@ -0,0 +1,27 @@
+package com.ygj.yuemum.controller.pay;
+
+
+import com.ygj.yuemum.domain.pay.CustomerPay;
+import com.ygj.yuemum.service.pay.CustomerPayService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+public class CustomerPayController {
+
+    @Autowired
+    private CustomerPayService customerPayService;
+    @GetMapping("/selectCustomerPay")
+    public List<CustomerPay> selectCustomerPay(@RequestParam("cp_orderno") String cp_orderno) {
+        List<CustomerPay> customerPays = customerPayService.selectCustomerPay(cp_orderno);
+        return customerPays;
+    }
+
+    @PostMapping("/insertCustomerPay")
+    public int insertCustomerPay(@ModelAttribute CustomerPay customerPay) {
+        return  customerPayService.insertCustomerPay(customerPay);
+    }
+
+}

src/main/java/com/ygj/yuemum/controller/pay/DiscountChannelController.java

@@ -0,0 +1,23 @@
+package com.ygj.yuemum.controller.pay;
+
+
+import com.ygj.yuemum.domain.pay.DiscountChannel;
+import com.ygj.yuemum.service.pay.DiscountChannelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+public class DiscountChannelController {
+
+    @Autowired
+    private DiscountChannelService discountChannelService;
+    @GetMapping("/getDiscountChannelSelect")
+    public List<DiscountChannel> getDiscountChannelSelect() {
+        List<DiscountChannel> discountChannels = discountChannelService.getDiscountChannelSelect();
+        return discountChannels;
+    }
+
+}

src/main/java/com/ygj/yuemum/controller/pay/PayMentsController.java

@@ -0,0 +1,29 @@
+package com.ygj.yuemum.controller.pay;
+
+
+import com.ygj.yuemum.domain.pay.PayMents;
+import com.ygj.yuemum.service.pay.PayMentsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+public class PayMentsController {
+
+    @Autowired
+    private PayMentsService payMentsService;
+    @GetMapping("/getPayMentSelect")
+    public List<PayMents> getPayMentSelect() {
+        List<PayMents> payMents = payMentsService.getPayMentSelect();
+        return payMents;
+    }
+
+    @GetMapping("/getPayMentAll")
+    public List<PayMents> getPayMentAll() {
+        List<PayMents> payMents = payMentsService.getPayMentAll();
+        return payMents;
+    }
+
+}

src/main/java/com/ygj/yuemum/dao/equipment/EquipmentInfoDao.java

@@ -24,5 +24,7 @@ public interface EquipmentInfoDao {
     int checkEquipmentInfo(String ei_code);
 
     int getCount();
+    int checkEquipmentHire(String ei_code);
+    int updateEIStatus(EquipmentInfo record);
 
 }

src/main/java/com/ygj/yuemum/dao/equipment/EquipmentReturnDao.java

@@ -0,0 +1,13 @@
+package com.ygj.yuemum.dao.equipment;
+
+import com.ygj.yuemum.domain.equipment.EquipmentReturn;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface EquipmentReturnDao {
+
+    List<EquipmentReturn> selectEquipmentReturn(String eh_code);
+    int insertEquipmentReturn(EquipmentReturn equipmentReturn);
+}

src/main/java/com/ygj/yuemum/dao/equipment/EquipmentTypeDao.java

@@ -9,4 +9,5 @@ import java.util.List;
 public interface EquipmentTypeDao {
 
     List<EquipmentType> getEquipmentTypes();
+    EquipmentType getEquipmentAmount(Integer et_type);
 }

src/main/java/com/ygj/yuemum/dao/equipment/EquipmenteHireDetailDao.java

@@ -0,0 +1,17 @@
+package com.ygj.yuemum.dao.equipment;
+
+import com.ygj.yuemum.domain.equipment.EquipmenteHireDetail;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface EquipmenteHireDetailDao {
+
+    List<EquipmenteHireDetail> getAll();
+    List<EquipmenteHireDetail> queryEquipmenteHireDetail(EquipmenteHireDetail equipmenteHireHead);
+    List<EquipmenteHireDetail> selectByPrimaryKey(String eh_code);
+    int deleteByPrimaryKey(String eh_code);
+    int insertSelective(EquipmenteHireDetail record);
+    int updateByPrimaryKeySelective(EquipmenteHireDetail record);
+}

src/main/java/com/ygj/yuemum/dao/equipment/EquipmenteHireHeadDao.java

@@ -0,0 +1,18 @@
+package com.ygj.yuemum.dao.equipment;
+
+import com.ygj.yuemum.domain.equipment.EquipmenteHireHead;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface EquipmenteHireHeadDao {
+
+    List<EquipmenteHireHead> getAll();
+    List<EquipmenteHireHead> queryEquipmenteHireHead(EquipmenteHireHead equipmenteHireHead);
+    EquipmenteHireHead selectByPrimaryKey(String eh_code);
+    int deleteByPrimaryKey(String eh_code);
+    int insertSelective(EquipmenteHireHead record);
+    int updateByPrimaryKeySelective(EquipmenteHireHead record);
+    int getSeq();
+}

src/main/java/com/ygj/yuemum/dao/pay/CustomerPayDao.java

@@ -0,0 +1,13 @@
+package com.ygj.yuemum.dao.pay;
+
+import com.ygj.yuemum.domain.pay.CustomerPay;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CustomerPayDao {
+
+    List<CustomerPay> selectCustomerPay(String cp_orderno);
+    int insertCustomerPay(CustomerPay customerPay);
+}

src/main/java/com/ygj/yuemum/dao/pay/DiscountChannelDao.java

@@ -0,0 +1,12 @@
+package com.ygj.yuemum.dao.pay;
+
+import com.ygj.yuemum.domain.pay.DiscountChannel;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface DiscountChannelDao {
+
+    List<DiscountChannel> getDiscountChannelSelect();
+}

src/main/java/com/ygj/yuemum/dao/pay/PayMentsDao.java

@@ -0,0 +1,13 @@
+package com.ygj.yuemum.dao.pay;
+
+import com.ygj.yuemum.domain.pay.PayMents;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PayMentsDao {
+
+    List<PayMents> getPayMentSelect();
+    List<PayMents> getPayMentAll();
+}

src/main/java/com/ygj/yuemum/domain/equipment/EquipmentInfo.java

@@ -5,12 +5,29 @@ public class EquipmentInfo {
     private Integer id;
     private String et_code;
     private String ei_code;
-    private Integer ei_rent;
+    private Integer et_rent;
     private Integer ei_status;
     private Integer page;
     private Integer limit;
     private String ei_date;
     private String user;
+    private Integer et_mortagage;
+
+    public Integer getEt_rent() {
+        return et_rent;
+    }
+
+    public void setEt_rent(Integer et_rent) {
+        this.et_rent = et_rent;
+    }
+
+    public Integer getEt_mortagage() {
+        return et_mortagage;
+    }
+
+    public void setEt_mortagage(Integer et_mortagage) {
+        this.et_mortagage = et_mortagage;
+    }
 
     public String getUser() {
         return user;
@@ -52,14 +69,6 @@ public class EquipmentInfo {
         this.ei_code = ei_code;
     }
 
-    public Integer getEi_rent() {
-        return ei_rent;
-    }
-
-    public void setEi_rent(Integer ei_rent) {
-        this.ei_rent = ei_rent;
-    }
-
     public Integer getEi_status() {
         return ei_status;
     }

src/main/java/com/ygj/yuemum/domain/equipment/EquipmentReturn.java

@@ -0,0 +1,68 @@
+package com.ygj.yuemum.domain.equipment;
+
+public class EquipmentReturn {
+
+    private Integer id;
+    private Integer er_return_rental;
+    private Integer er_return_mortagage;
+    private String er_return_remarks;
+    private String eh_code;
+    private String er_usercode;
+    private String er_date;
+
+    public Integer getEr_return_mortagage() {
+        return er_return_mortagage;
+    }
+
+    public void setEr_return_mortagage(Integer er_return_mortagage) {
+        this.er_return_mortagage = er_return_mortagage;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getEr_return_rental() {
+        return er_return_rental;
+    }
+
+    public void setEr_return_rental(Integer er_return_rental) {
+        this.er_return_rental = er_return_rental;
+    }
+
+    public String getEr_return_remarks() {
+        return er_return_remarks;
+    }
+
+    public void setEr_return_remarks(String er_return_remarks) {
+        this.er_return_remarks = er_return_remarks;
+    }
+
+    public String getEh_code() {
+        return eh_code;
+    }
+
+    public void setEh_code(String eh_code) {
+        this.eh_code = eh_code;
+    }
+
+    public String getEr_usercode() {
+        return er_usercode;
+    }
+
+    public void setEr_usercode(String er_usercode) {
+        this.er_usercode = er_usercode;
+    }
+
+    public String getEr_date() {
+        return er_date;
+    }
+
+    public void setEr_date(String er_date) {
+        this.er_date = er_date;
+    }
+}

src/main/java/com/ygj/yuemum/domain/equipment/EquipmentType.java

@@ -4,6 +4,25 @@ public class EquipmentType {
     private Integer id;
     private Integer et_code;
     private String et_name;
+    private Integer et_mortagage;
+    private Integer et_rent;
+
+
+    public Integer getEt_mortagage() {
+        return et_mortagage;
+    }
+
+    public void setEt_mortagage(Integer et_mortagage) {
+        this.et_mortagage = et_mortagage;
+    }
+
+    public Integer getEt_rent() {
+        return et_rent;
+    }
+
+    public void setEt_rent(Integer et_rent) {
+        this.et_rent = et_rent;
+    }
 
     public Integer getId() {
         return id;

src/main/java/com/ygj/yuemum/domain/equipment/EquipmenteHireDetail.java

@@ -0,0 +1,114 @@
+package com.ygj.yuemum.domain.equipment;
+
+public class EquipmenteHireDetail {
+
+    private Integer id;
+    private String eh_code;
+    private String et_type;
+    private String ed_emcode;
+    private Integer ei_rent;
+    private Integer ei_mortagage;
+    private String ed_startdate;
+    private String ed_enddate;
+    private String ed_rental;// ????
+    private Integer  et_typeid;
+
+    public Integer getEt_typeid() {
+        return et_typeid;
+    }
+
+    public void setEt_typeid(Integer et_typeid) {
+        this.et_typeid = et_typeid;
+    }
+
+    public String getEd_rental() {
+        return ed_rental;
+    }
+
+    public void setEd_rental(String ed_rental) {
+        this.ed_rental = ed_rental;
+    }
+
+    private int limit;
+    private int page;
+
+    public Integer getEi_rent() {
+        return ei_rent;
+    }
+
+    public void setEi_rent(Integer ei_rent) {
+        this.ei_rent = ei_rent;
+    }
+
+    public Integer getEi_mortagage() {
+        return ei_mortagage;
+    }
+
+    public void setEi_mortagage(Integer ei_mortagage) {
+        this.ei_mortagage = ei_mortagage;
+    }
+
+    public String getEh_code() {
+        return eh_code;
+    }
+
+    public void setEh_code(String eh_code) {
+        this.eh_code = eh_code;
+    }
+
+    public String getEt_type() {
+        return et_type;
+    }
+
+    public void setEt_type(String et_type) {
+        this.et_type = et_type;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getEd_emcode() {
+        return ed_emcode;
+    }
+
+    public void setEd_emcode(String ed_emcode) {
+        this.ed_emcode = ed_emcode;
+    }
+
+    public String getEd_startdate() {
+        return ed_startdate;
+    }
+
+    public void setEd_startdate(String ed_startdate) {
+        this.ed_startdate = ed_startdate;
+    }
+
+    public String getEd_enddate() {
+        return ed_enddate;
+    }
+
+    public void setEd_enddate(String ed_enddate) {
+        this.ed_enddate = ed_enddate;
+    }
+
+    public int getLimit() {
+        return limit;
+    }
+
+    public void setLimit(int limit) {
+        this.limit = limit;
+    }
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+}

src/main/java/com/ygj/yuemum/domain/equipment/EquipmenteHireHead.java

@@ -0,0 +1,167 @@
+package com.ygj.yuemum.domain.equipment;
+
+public class EquipmenteHireHead {
+
+    private Integer id;
+    private String eh_code;
+    private Integer eh_mortagage;
+    private Integer eh_rental;
+    private String eh_cmname;
+    private String eh_cmphone;
+    private String eh_cmidcard;
+    private String eh_cmaddress;
+    private String eh_usercode;
+    private String eh_date;
+    private String eh_detail;
+    private Integer eh_status;
+    private Integer limit;
+    private Integer page;
+    private String et_type;
+    private String ed_emcode;
+    private String ed_startdate;
+    private String ed_enddate;
+
+    public String getEt_type() {
+        return et_type;
+    }
+
+    public void setEt_type(String et_type) {
+        this.et_type = et_type;
+    }
+
+    public String getEd_emcode() {
+        return ed_emcode;
+    }
+
+    public void setEd_emcode(String ed_emcode) {
+        this.ed_emcode = ed_emcode;
+    }
+
+    public String getEd_startdate() {
+        return ed_startdate;
+    }
+
+    public void setEd_startdate(String ed_startdate) {
+        this.ed_startdate = ed_startdate;
+    }
+
+    public String getEd_enddate() {
+        return ed_enddate;
+    }
+
+    public void setEd_enddate(String ed_enddate) {
+        this.ed_enddate = ed_enddate;
+    }
+
+    public String getEh_detail() {
+        return eh_detail;
+    }
+
+    public void setEh_detail(String eh_detail) {
+        this.eh_detail = eh_detail;
+    }
+
+    public Integer getEh_status() {
+        return eh_status;
+    }
+
+    public void setEh_status(Integer eh_status) {
+        this.eh_status = eh_status;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getEh_code() {
+        return eh_code;
+    }
+
+    public void setEh_code(String eh_code) {
+        this.eh_code = eh_code;
+    }
+
+    public Integer getEh_mortagage() {
+        return eh_mortagage;
+    }
+
+    public void setEh_mortagage(Integer eh_mortagage) {
+        this.eh_mortagage = eh_mortagage;
+    }
+
+    public Integer getEh_rental() {
+        return eh_rental;
+    }
+
+    public void setEh_rental(Integer eh_rental) {
+        this.eh_rental = eh_rental;
+    }
+
+    public String getEh_cmname() {
+        return eh_cmname;
+    }
+
+    public void setEh_cmname(String eh_cmname) {
+        this.eh_cmname = eh_cmname;
+    }
+
+    public String getEh_cmphone() {
+        return eh_cmphone;
+    }
+
+    public void setEh_cmphone(String eh_cmphone) {
+        this.eh_cmphone = eh_cmphone;
+    }
+
+    public String getEh_cmidcard() {
+        return eh_cmidcard;
+    }
+
+    public void setEh_cmidcard(String eh_cmidcard) {
+        this.eh_cmidcard = eh_cmidcard;
+    }
+
+    public String getEh_cmaddress() {
+        return eh_cmaddress;
+    }
+
+    public void setEh_cmaddress(String eh_cmaddress) {
+        this.eh_cmaddress = eh_cmaddress;
+    }
+
+    public String getEh_usercode() {
+        return eh_usercode;
+    }
+
+    public void setEh_usercode(String eh_usercode) {
+        this.eh_usercode = eh_usercode;
+    }
+
+    public String getEh_date() {
+        return eh_date;
+    }
+
+    public void setEh_date(String eh_date) {
+        this.eh_date = eh_date;
+    }
+}

src/main/java/com/ygj/yuemum/domain/pay/CustomerPay.java

@@ -0,0 +1,113 @@
+package com.ygj.yuemum.domain.pay;
+
+public class CustomerPay {
+
+    private Integer id;
+    private Integer cp_ordertype;
+    private String cp_orderno;
+    private Integer cp_channel;
+    private Integer cp_discount;
+    private String cp_paytype;
+    private Integer cp_payamount;
+    private String cp_comments;
+    private String cp_usercode;
+    private String cp_date;
+    private Integer page;
+    private Integer limit;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCp_ordertype() {
+        return cp_ordertype;
+    }
+
+    public void setCp_ordertype(Integer cp_ordertype) {
+        this.cp_ordertype = cp_ordertype;
+    }
+
+    public String getCp_orderno() {
+        return cp_orderno;
+    }
+
+    public void setCp_orderno(String cp_orderno) {
+        this.cp_orderno = cp_orderno;
+    }
+
+    public Integer getCp_channel() {
+        return cp_channel;
+    }
+
+    public void setCp_channel(Integer cp_channel) {
+        this.cp_channel = cp_channel;
+    }
+
+    public Integer getCp_discount() {
+        return cp_discount;
+    }
+
+    public void setCp_discount(Integer cp_discount) {
+        this.cp_discount = cp_discount;
+    }
+
+    public String getCp_paytype() {
+        return cp_paytype;
+    }
+
+    public void setCp_paytype(String cp_paytype) {
+        this.cp_paytype = cp_paytype;
+    }
+
+    public Integer getCp_payamount() {
+        return cp_payamount;
+    }
+
+    public void setCp_payamount(Integer cp_payamount) {
+        this.cp_payamount = cp_payamount;
+    }
+
+    public String getCp_comments() {
+        return cp_comments;
+    }
+
+    public void setCp_comments(String cp_comments) {
+        this.cp_comments = cp_comments;
+    }
+
+    public String getCp_usercode() {
+        return cp_usercode;
+    }
+
+    public void setCp_usercode(String cp_usercode) {
+        this.cp_usercode = cp_usercode;
+    }
+
+    public String getCp_date() {
+        return cp_date;
+    }
+
+    public void setCp_date(String cp_date) {
+        this.cp_date = cp_date;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+}

src/main/java/com/ygj/yuemum/domain/pay/DiscountChannel.java

@@ -0,0 +1,31 @@
+package com.ygj.yuemum.domain.pay;
+
+public class DiscountChannel {
+    private Integer id;
+    private Integer dc_code;
+    private String dc_name;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getDc_code() {
+        return dc_code;
+    }
+
+    public void setDc_code(Integer dc_code) {
+        this.dc_code = dc_code;
+    }
+
+    public String getDc_name() {
+        return dc_name;
+    }
+
+    public void setDc_name(String dc_name) {
+        this.dc_name = dc_name;
+    }
+}

src/main/java/com/ygj/yuemum/domain/pay/PayMents.java

@@ -0,0 +1,76 @@
+package com.ygj.yuemum.domain.pay;
+
+public class PayMents {
+    private Integer id;
+    private String pm_code;
+    private String pm_name;
+    private String pm_desc;
+    private Integer pm_order;
+    private String pm_config;
+    private Integer pm_enable;
+    private Integer pm_isonline;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getPm_code() {
+        return pm_code;
+    }
+
+    public void setPm_code(String pm_code) {
+        this.pm_code = pm_code;
+    }
+
+    public String getPm_name() {
+        return pm_name;
+    }
+
+    public void setPm_name(String pm_name) {
+        this.pm_name = pm_name;
+    }
+
+    public String getPm_desc() {
+        return pm_desc;
+    }
+
+    public void setPm_desc(String pm_desc) {
+        this.pm_desc = pm_desc;
+    }
+
+    public Integer getPm_order() {
+        return pm_order;
+    }
+
+    public void setPm_order(Integer pm_order) {
+        this.pm_order = pm_order;
+    }
+
+    public String getPm_config() {
+        return pm_config;
+    }
+
+    public void setPm_config(String pm_config) {
+        this.pm_config = pm_config;
+    }
+
+    public Integer getPm_enable() {
+        return pm_enable;
+    }
+
+    public void setPm_enable(Integer pm_enable) {
+        this.pm_enable = pm_enable;
+    }
+
+    public Integer getPm_isonline() {
+        return pm_isonline;
+    }
+
+    public void setPm_isonline(Integer pm_isonline) {
+        this.pm_isonline = pm_isonline;
+    }
+}

src/main/java/com/ygj/yuemum/service/equipment/EquipmentInfoService.java

@@ -75,7 +75,20 @@ public class EquipmentInfoService {
     }
 
     public int updateEquipmentInfo(EquipmentInfo equipmentInfo) {
-        return equipmentInfoDao.updateByPrimaryKeySelective(equipmentInfo);
+        try{
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            EquipmentLog equipmentLog = new EquipmentLog();
+            equipmentLog.setEi_code(equipmentInfo.getEi_code());
+            equipmentLog.setEl_status(4);
+            equipmentLog.setEl_user(equipmentInfo.getUser());
+            equipmentLog.setEl_date(sdf.format(new Date()));
+            equipmentLogService.insertEquipmentLog(equipmentLog);
+            equipmentInfoDao.updateByPrimaryKeySelective(equipmentInfo);
+        }catch (Exception ex){
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
     }
 
     public EquipmentInfo getEquipmentInfo(Integer id) {
@@ -88,5 +101,11 @@ public class EquipmentInfoService {
     public int checkEquipmentInfo(String ei_code){
         return equipmentInfoDao.checkEquipmentInfo(ei_code);
     }
+    public int checkEquipmentHire(String ei_code){
+        return equipmentInfoDao.checkEquipmentHire(ei_code);
+    }
+    public int updateEIStatus(EquipmentInfo equipmentInfo){
+        return equipmentInfoDao.updateEIStatus(equipmentInfo);
+    }
 
 }

src/main/java/com/ygj/yuemum/service/equipment/EquipmentReturnService.java

@@ -0,0 +1,71 @@
+package com.ygj.yuemum.service.equipment;
+
+import com.ygj.yuemum.dao.equipment.EquipmentReturnDao;
+import com.ygj.yuemum.dao.equipment.EquipmenteHireDetailDao;
+import com.ygj.yuemum.dao.equipment.EquipmenteHireHeadDao;
+import com.ygj.yuemum.domain.equipment.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class EquipmentReturnService {
+
+    @Autowired
+
+    private EquipmentReturnDao equipmentReturnDao;
+    @Autowired
+    private EquipmentInfoService equipmentInfoService;
+    @Autowired
+    private EquipmentLogService equipmentLogService;
+    @Autowired
+    private EquipmenteHireHeadDao equipmenteHireHeadDao;
+    @Autowired
+    private EquipmenteHireDetailDao equipmenteHireDetailDao;
+
+
+    public List<EquipmentReturn> selectEquipmentReturn(String cp_orderno) {
+        return equipmentReturnDao.selectEquipmentReturn(cp_orderno);
+    }
+
+    public int insertEquipmentReturn(EquipmentReturn equipmentReturn) {
+        try {
+            //save
+            List<EquipmentReturn> checks = equipmentReturnDao.selectEquipmentReturn(equipmentReturn.getEh_code());
+            if(checks.size() != 0){
+                return 2;
+            }
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            equipmentReturn.setEr_date(sdf.format(new Date()));
+            equipmentReturnDao.insertEquipmentReturn(equipmentReturn);
+            EquipmenteHireHead equipmenteHireHead = new EquipmenteHireHead();
+            equipmenteHireHead.setEh_code(equipmentReturn.getEh_code());
+            equipmenteHireHead.setEh_status(4);
+            equipmenteHireHeadDao.updateByPrimaryKeySelective(equipmenteHireHead);
+            List<EquipmenteHireDetail> equipmenteHireDetails = equipmenteHireDetailDao.selectByPrimaryKey(equipmentReturn.getEh_code());
+            for (EquipmenteHireDetail ed : equipmenteHireDetails) {
+                // update updateEIStatus
+                EquipmentInfo equipmentInfo = new EquipmentInfo();
+                equipmentInfo.setEi_code(ed.getEd_emcode());
+                equipmentInfo.setEi_status(1);
+                equipmentInfoService.updateEIStatus(equipmentInfo);
+                // log
+                EquipmentLog equipmentLog = new EquipmentLog();
+                equipmentLog.setEi_code(ed.getEd_emcode());
+                equipmentLog.setEl_status(3);
+                equipmentLog.setEl_billno(equipmentReturn.getEh_code());
+                equipmentLog.setEl_user(equipmentReturn.getEr_usercode());
+                equipmentLog.setEl_date(sdf.format(new Date()));
+                equipmentLogService.insertEquipmentLog(equipmentLog);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
+    }
+
+}

src/main/java/com/ygj/yuemum/service/equipment/EquipmentTypeService.java

@@ -18,4 +18,8 @@ public class EquipmentTypeService {
         return equipmentTypeDao.getEquipmentTypes();
     }
 
+    public EquipmentType getEquipmentAmount(Integer et_type){
+        return equipmentTypeDao.getEquipmentAmount(et_type);
+    }
+
 }

src/main/java/com/ygj/yuemum/service/equipment/EquipmenteHireDetailService.java

@@ -0,0 +1,81 @@
+package com.ygj.yuemum.service.equipment;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ygj.yuemum.dao.equipment.EquipmenteHireDetailDao;
+import com.ygj.yuemum.domain.equipment.EquipmenteHireDetail;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class EquipmenteHireDetailService {
+
+    @Autowired
+    private EquipmenteHireDetailDao equipmenteHireDetailDao;
+
+    public Map<String, Object> getEquipmenteHireDetails(int page, int limit) {
+        PageHelper.startPage(page, limit);
+        List<EquipmenteHireDetail> equipmenteHireDetails = equipmenteHireDetailDao.getAll();
+
+        PageInfo<EquipmenteHireDetail> pageInfo = new PageInfo<EquipmenteHireDetail>(equipmenteHireDetails);
+        long count = pageInfo.getTotal(); //获取总记录数
+
+        Map<String, Object> tableData = new HashMap<>();
+        tableData.put("items", equipmenteHireDetails);
+        tableData.put("total", count);
+        return tableData;
+    }
+
+    public Map<String, Object> queryEquipmenteHireDetail(EquipmenteHireDetail equipmenteHireDetail) {
+        PageHelper.startPage(equipmenteHireDetail.getPage(), equipmenteHireDetail.getLimit());
+        List<EquipmenteHireDetail> equipmenteHireDetails = equipmenteHireDetailDao.queryEquipmenteHireDetail(equipmenteHireDetail);
+
+        PageInfo<EquipmenteHireDetail> pageInfo = new PageInfo<EquipmenteHireDetail>(equipmenteHireDetails);
+        long count = pageInfo.getTotal(); //获取总记录数
+
+        Map<String, Object> tableData = new HashMap<>();
+        tableData.put("items", equipmenteHireDetails);
+        tableData.put("total", count);
+        return tableData;
+    }
+
+    public List<EquipmenteHireDetail> getAll() {
+        List<EquipmenteHireDetail> equipmenteHireDetails = equipmenteHireDetailDao.getAll();
+        return equipmenteHireDetails;
+    }
+
+    public List<EquipmenteHireDetail> selectByPrimaryKey(String eh_code) {
+        List<EquipmenteHireDetail> equipmenteHireDetails = equipmenteHireDetailDao.selectByPrimaryKey(eh_code);
+        return equipmenteHireDetails;
+    }
+
+    public int addEquipmenteHireDetail(EquipmenteHireDetail equipmenteHireDetail) {
+        try {
+            equipmenteHireDetailDao.insertSelective(equipmenteHireDetail);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
+    }
+
+    public int deleteEquipmenteHireDetail(String eh_code) {
+        return equipmenteHireDetailDao.deleteByPrimaryKey(eh_code);
+    }
+
+    public int updateEquipmenteHireDetail(EquipmenteHireDetail equipmenteHireDetail) {
+        try {
+            equipmenteHireDetailDao.updateByPrimaryKeySelective(equipmenteHireDetail);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
+    }
+
+
+}

src/main/java/com/ygj/yuemum/service/equipment/EquipmenteHireHeadService.java

@@ -0,0 +1,139 @@
+package com.ygj.yuemum.service.equipment;
+
+import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ygj.yuemum.dao.equipment.EquipmenteHireHeadDao;
+import com.ygj.yuemum.domain.equipment.EquipmenteHireDetail;
+import com.ygj.yuemum.domain.equipment.EquipmenteHireHead;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class EquipmenteHireHeadService {
+
+    @Autowired
+    private EquipmenteHireHeadDao equipmenteHireHeadDao;
+    @Autowired
+    private EquipmenteHireDetailService equipmenteHireDetailService;
+    @Autowired
+    private EquipmentInfoService equipmentInfoService;
+
+    public Map<String, Object> queryEquipmenteHireHead(EquipmenteHireHead equipmenteHireHead) {
+        PageHelper.startPage(equipmenteHireHead.getPage(), equipmenteHireHead.getLimit());
+        List<EquipmenteHireHead> equipmenteHireHeads = equipmenteHireHeadDao.queryEquipmenteHireHead(equipmenteHireHead);
+
+        PageInfo<EquipmenteHireHead> pageInfo = new PageInfo<EquipmenteHireHead>(equipmenteHireHeads);
+        long count = pageInfo.getTotal(); //获取总记录数
+
+        Map<String, Object> tableData = new HashMap<>();
+        tableData.put("items", equipmenteHireHeads);
+        tableData.put("total", count);
+        return tableData;
+    }
+
+    public Map<String, Object> getAll(int page, int limit) {
+        PageHelper.startPage(page, limit);
+        List<EquipmenteHireHead> equipmenteHireHeads = equipmenteHireHeadDao.getAll();
+
+        PageInfo<EquipmenteHireHead> pageInfo = new PageInfo<EquipmenteHireHead>(equipmenteHireHeads);
+        long count = pageInfo.getTotal(); //获取总记录数
+
+        Map<String, Object> tableData = new HashMap<>();
+        tableData.put("items", equipmenteHireHeads);
+        tableData.put("total", count);
+        return tableData;
+    }
+
+
+    public int addEquipmenteHireHead(EquipmenteHireHead equipmenteHireHead) {
+        try {
+            int seq = equipmenteHireHeadDao.getSeq() + 1;
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");
+            String orderno = "EH" + sdf.format(new Date()) + "00" + seq;
+            //add Head
+            equipmenteHireHead.setEh_code(orderno);
+            equipmenteHireHead.setEh_status(1);
+            Date date = sdfdate.parse(equipmenteHireHead.getEh_date());
+            equipmenteHireHead.setEh_date(sdfdate.format(date));
+            equipmenteHireHeadDao.insertSelective(equipmenteHireHead);
+            //add Detail
+            List<EquipmenteHireDetail> equipmenteHireDetails = JSON.parseArray(equipmenteHireHead.getEh_detail(), EquipmenteHireDetail.class);
+            for (EquipmenteHireDetail ed : equipmenteHireDetails) {
+
+                int check = equipmentInfoService.checkEquipmentHire(ed.getEd_emcode());
+                if (check == 0) {
+                    return 2;
+                } else {
+                    ed.setEh_code(orderno);
+                    Date datestart = sdfdate.parse(ed.getEd_startdate());
+                    Date dateend = sdfdate.parse(ed.getEd_enddate().replace('/', '-'));
+                    ed.setEd_startdate(sdfdate.format(datestart));
+                    ed.setEd_enddate(sdfdate.format(dateend));
+                    equipmenteHireDetailService.addEquipmenteHireDetail(ed);
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
+    }
+
+    public int deleteEquipmenteHireHead(String eh_code) {
+        try {
+            equipmenteHireHeadDao.deleteByPrimaryKey(eh_code);
+            equipmenteHireDetailService.deleteEquipmenteHireDetail(eh_code);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
+    }
+
+    public EquipmenteHireHead getEquipmenteHireHead(String eh_code) {
+        EquipmenteHireHead equipmenteHireHead = equipmenteHireHeadDao.selectByPrimaryKey(eh_code);
+        return equipmenteHireHead;
+    }
+
+    public int updateEquipmenteHireHead(EquipmenteHireHead equipmenteHireHead) {
+        try {
+            SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");
+            //update Head
+            Date date = sdfdate.parse(equipmenteHireHead.getEh_date());
+            equipmenteHireHead.setEh_date(sdfdate.format(date));
+            equipmenteHireHeadDao.updateByPrimaryKeySelective(equipmenteHireHead);
+            //update Detail
+            List<EquipmenteHireDetail> equipmenteHireDetails = JSON.parseArray(equipmenteHireHead.getEh_detail(), EquipmenteHireDetail.class);
+            for (EquipmenteHireDetail ed : equipmenteHireDetails) {
+                int check = equipmentInfoService.checkEquipmentHire(ed.getEd_emcode());
+                if (check == 0) {
+                    return 2;
+                }
+            }
+            equipmenteHireDetailService.deleteEquipmenteHireDetail(equipmenteHireHead.getEh_code());
+            for (EquipmenteHireDetail ed : equipmenteHireDetails) {
+                ed.setEh_code(equipmenteHireHead.getEh_code());
+                Date datestart = sdfdate.parse(ed.getEd_startdate());
+                Date dateend = sdfdate.parse(ed.getEd_enddate().replace('/', '-'));
+                ed.setEt_type(String.valueOf(ed.getEt_typeid()));
+                ed.setEd_startdate(sdfdate.format(datestart));
+                ed.setEd_enddate(sdfdate.format(dateend));
+                equipmenteHireDetailService.addEquipmenteHireDetail(ed);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
+    }
+
+
+}

src/main/java/com/ygj/yuemum/service/pay/CustomerPayService.java

@@ -0,0 +1,70 @@
+package com.ygj.yuemum.service.pay;
+
+import com.ygj.yuemum.dao.equipment.EquipmenteHireDetailDao;
+import com.ygj.yuemum.dao.equipment.EquipmenteHireHeadDao;
+import com.ygj.yuemum.dao.pay.CustomerPayDao;
+import com.ygj.yuemum.domain.equipment.EquipmentInfo;
+import com.ygj.yuemum.domain.equipment.EquipmentLog;
+import com.ygj.yuemum.domain.equipment.EquipmenteHireDetail;
+import com.ygj.yuemum.domain.equipment.EquipmenteHireHead;
+import com.ygj.yuemum.domain.pay.CustomerPay;
+import com.ygj.yuemum.service.equipment.EquipmentInfoService;
+import com.ygj.yuemum.service.equipment.EquipmentLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class CustomerPayService {
+
+    @Autowired
+
+    private CustomerPayDao customerPayDao;
+    @Autowired
+    private EquipmentInfoService equipmentInfoService;
+    @Autowired
+    private EquipmentLogService equipmentLogService;
+    @Autowired
+    private EquipmenteHireHeadDao equipmenteHireHeadDao;
+    @Autowired
+    private EquipmenteHireDetailDao equipmenteHireDetailDao;
+
+    public List<CustomerPay> selectCustomerPay(String cp_orderno) {
+        return customerPayDao.selectCustomerPay(cp_orderno);
+    }
+    public int insertCustomerPay(CustomerPay customerPay) {
+        try{
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            customerPayDao.insertCustomerPay(customerPay);
+            EquipmenteHireHead equipmenteHireHead = new EquipmenteHireHead();
+            equipmenteHireHead.setEh_code(customerPay.getCp_orderno());
+            equipmenteHireHead.setEh_status(2);
+            equipmenteHireHeadDao.updateByPrimaryKeySelective(equipmenteHireHead);
+            List<EquipmenteHireDetail> equipmenteHireDetails = equipmenteHireDetailDao.selectByPrimaryKey(customerPay.getCp_orderno());
+            for (EquipmenteHireDetail ed : equipmenteHireDetails) {
+                // update updateEIStatus
+                EquipmentInfo equipmentInfo = new EquipmentInfo();
+                equipmentInfo.setEi_code(ed.getEd_emcode());
+                equipmentInfo.setEi_status(2);
+                equipmentInfoService.updateEIStatus(equipmentInfo);
+                // log
+                EquipmentLog equipmentLog = new EquipmentLog();
+                equipmentLog.setEi_code(ed.getEd_emcode());
+                equipmentLog.setEl_status(2);
+                equipmentLog.setEl_billno(customerPay.getCp_orderno());
+                equipmentLog.setEl_user(customerPay.getCp_usercode());
+                equipmentLog.setEl_date(sdf.format(new Date()));
+                equipmentLogService.insertEquipmentLog(equipmentLog);
+            }
+
+        }catch (Exception ex){
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
+    }
+
+}

src/main/java/com/ygj/yuemum/service/pay/DiscountChannelService.java

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.service.pay;
+
+import com.ygj.yuemum.dao.pay.DiscountChannelDao;
+import com.ygj.yuemum.domain.pay.DiscountChannel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DiscountChannelService {
+
+    @Autowired
+
+    private DiscountChannelDao discountChannelDao;
+
+    public List<DiscountChannel> getDiscountChannelSelect() {
+        return discountChannelDao.getDiscountChannelSelect();
+    }
+
+
+}

src/main/java/com/ygj/yuemum/service/pay/PayMentsService.java

@@ -0,0 +1,24 @@
+package com.ygj.yuemum.service.pay;
+
+import com.ygj.yuemum.dao.pay.PayMentsDao;
+import com.ygj.yuemum.domain.pay.PayMents;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PayMentsService {
+
+    @Autowired
+
+    private PayMentsDao payMentsDao;
+
+    public List<PayMents> getPayMentSelect() {
+        return payMentsDao.getPayMentSelect();
+    }
+    public List<PayMents> getPayMentAll() {
+        return payMentsDao.getPayMentAll();
+    }
+
+}

src/main/resources/application.yml

@@ -2,8 +2,8 @@ server:
   port: 8888
 mybatis:
   config-location: classpath:mybatis/mybatis-config.xml
-  mapper-locations: mybatis/mapper/admin/*.xml,mybatis/mapper/maternitymatron/*.xml,mybatis/mapper/coupon/*.xml,mybatis/mapper/global/*.xml,mybatis/mapper/customer/*.xml,mybatis/mapper/modoo/*.xml,mybatis/mapper/order/*.xml,mybatis/mapper/equipment/*.xml
-  mybatis.type-aliases-package: com.ygj.yuemum.domain/admin,com.ygj.yuemum.domain/maternitymatron,com.ygj.yuemum.domain/coupon,com.ygj.yuemum.domain/global,com.ygj.yuemum.domain/customer,com.ygj.yuemum.domain/modoo,com.ygj.yuemum.domain/order,com.ygj.yuemum.domain/equipment
+  mapper-locations: mybatis/mapper/admin/*.xml,mybatis/mapper/maternitymatron/*.xml,mybatis/mapper/coupon/*.xml,mybatis/mapper/global/*.xml,mybatis/mapper/customer/*.xml,mybatis/mapper/modoo/*.xml,mybatis/mapper/order/*.xml,mybatis/mapper/equipment/*.xml,mybatis/mapper/pay/*.xml
+  mybatis.type-aliases-package: com.ygj.yuemum.domain/admin,com.ygj.yuemum.domain/maternitymatron,com.ygj.yuemum.domain/coupon,com.ygj.yuemum.domain/global,com.ygj.yuemum.domain/customer,com.ygj.yuemum.domain/modoo,com.ygj.yuemum.domain/order,com.ygj.yuemum.domain/equipment,com.ygj.yuemum.domain/pay
   log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 spring:
   datasource:
@@ -20,4 +20,7 @@ pagehelper:
   helper-dialect: mysql
   reasonable: true
   support-methods-arguments: true
-  params: count=countSql
+  params: count=countSql
+logging:
+  level:
+     com.ygj.yuemum.dao : debug

src/main/resources/mybatis/mapper/equipment/EquipmentInfoMapper.xml

@@ -6,9 +6,10 @@
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="et_code" property="et_code" jdbcType="VARCHAR" />
         <result column="ei_code" property="ei_code" jdbcType="VARCHAR" />
-        <result column="ei_rent" property="ei_rent" jdbcType="INTEGER" />
+        <result column="et_rent" property="et_rent" jdbcType="INTEGER" />
         <result column="ei_status" property="ei_status" jdbcType="INTEGER" />
         <result column="ei_date" property="ei_date" jdbcType="DATE" />
+        <result column="et_mortagage" property="et_mortagage" jdbcType="INTEGER" />
     </resultMap>
 
     <sql id="Base_Column_List" >
@@ -23,31 +24,48 @@
     </select>
 
     <select id="getAll" resultMap="BaseResultMap" >
-        select
-        id,fgetequipmenttypename(et_code) et_code, ei_code,ei_rent,ei_status,ei_date
-        from equipment_info
-        order by id desc
+        SELECT
+            equipment_info.id,
+            fgetequipmenttypename (equipment_info.et_code) et_code,
+            equipment_info.ei_code,
+            equipment_info.ei_status,
+            equipment_info.ei_date,
+            equipment_type.et_rent,
+            equipment_type.et_mortagage
+        FROM
+            equipment_info LEFT JOIN equipment_type ON
+            equipment_info.et_code = equipment_type.et_code
+        ORDER BY
+            id DESC
     </select>
 
     <select id="queryEquipmentInfo" resultMap="BaseResultMap" parameterType="com.ygj.yuemum.domain.equipment.EquipmentInfo">
-        select
-        id,fgetequipmenttypename(et_code) et_code, ei_code,ei_rent,ei_status,ei_date
-        from equipment_info
+        SELECT
+        equipment_info.id,
+        fgetequipmenttypename (equipment_info.et_code) et_code,
+        equipment_info.ei_code,
+        equipment_info.ei_status,
+        equipment_info.ei_date,
+        equipment_type.et_rent,
+        equipment_type.et_mortagage
+        FROM
+        equipment_info LEFT JOIN equipment_type ON
+        equipment_info.et_code = equipment_type.et_code
         where 1=1
         <if test="ei_code != null and et_code != ''">
-            and ei_code = #{ei_code,jdbcType=INTEGER}
+            and equipment_info.ei_code = #{ei_code,jdbcType=INTEGER}
         </if>
         <if test="et_code != null and et_code != ''">
-            and et_code = #{et_code,jdbcType=INTEGER}
+            and equipment_info.et_code = #{et_code,jdbcType=INTEGER}
         </if>
-        <if test="ei_rent != null and ei_rent != ''">
-            and ei_rent = #{ei_rent,jdbcType=INTEGER}
+        <if test="et_rent != null and et_rent != ''">
+            and equipment_info.et_rent = #{et_rent,jdbcType=INTEGER}
         </if>
         <if test="ei_status != null and ei_status != ''">
-            and ei_status = #{ei_status,jdbcType=INTEGER}
+            and equipment_info.ei_status = #{ei_status,jdbcType=INTEGER}
         </if>
         <if test="ei_date != null and ei_date != ''">
-            and ei_date = #{ei_date,jdbcType=DATE}
+            and equipment_info.ei_date = #{ei_date,jdbcType=DATE}
         </if>
         order by id desc
     </select>
@@ -73,6 +91,14 @@
         where ei_code = #{ei_code,jdbcType=INTEGER}
     </select>
 
+    <select id="checkEquipmentHire" resultType="java.lang.Integer" parameterType="java.lang.String" >
+        select
+        count(1)
+        from equipment_info
+        where ei_code = #{ei_code,jdbcType=INTEGER}
+        and ei_status = 1
+    </select>
+
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
         delete from equipment_info
         where id = #{id,jdbcType=VARCHAR}
@@ -139,4 +165,13 @@
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
+    <update id="updateEIStatus" parameterType="com.ygj.yuemum.domain.equipment.EquipmentInfo" >
+        update equipment_info
+        <set >
+            <if test="ei_status != null" >
+                ei_status = #{ei_status,jdbcType=INTEGER}
+            </if>
+        </set>
+        where ei_code = #{ei_code,jdbcType=INTEGER}
+    </update>
 </mapper>

src/main/resources/mybatis/mapper/equipment/EquipmentReturnMapper.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ygj.yuemum.dao.equipment.EquipmentReturnDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.equipment.EquipmentReturn" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="er_return_mortagage" property="er_return_mortagage" jdbcType="INTEGER" />
+        <result column="er_return_rental" property="er_return_rental" jdbcType="INTEGER" />
+        <result column="er_return_remarks" property="er_return_remarks" jdbcType="VARCHAR" />
+        <result column="eh_code" property="eh_code" jdbcType="VARCHAR" />
+        <result column="er_usercode" property="er_usercode" jdbcType="VARCHAR" />
+        <result column="er_date" property="er_date" jdbcType="DATE" />
+    </resultMap>
+
+    <!-- 此处添加查询信息-->
+    <select id="selectEquipmentReturn" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        er_return_rental,er_return_mortagage,er_return_remarks,eh_code,er_usercode,er_date
+        from equipment_return
+        where eh_code = #{eh_code,jdbcType=VARCHAR}
+        order by id desc
+    </select>
+
+    <!-- 插入一条培训信息 -->
+    <insert id="insertEquipmentReturn" parameterType="com.ygj.yuemum.domain.equipment.EquipmentReturn" >
+        insert into equipment_return
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="er_return_rental != null" >
+                er_return_rental,
+            </if>
+            <if test="er_return_mortagage != null" >
+                er_return_mortagage,
+            </if>
+            <if test="er_return_remarks != null" >
+                er_return_remarks,
+            </if>
+            <if test="eh_code != null" >
+                eh_code,
+            </if>
+            <if test="er_usercode != null" >
+                er_usercode,
+            </if>
+            <if test="er_date != null" >
+                er_date
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="er_return_rental != null" >
+                #{er_return_rental,jdbcType=INTEGER},
+            </if>
+            <if test="er_return_mortagage != null" >
+                #{er_return_mortagage,jdbcType=INTEGER},
+            </if>
+            <if test="er_return_remarks != null" >
+                #{er_return_remarks,jdbcType=VARCHAR},
+            </if>
+            <if test="eh_code != null" >
+                #{eh_code,jdbcType=VARCHAR},
+            </if>
+            <if test="er_usercode != null" >
+                #{er_usercode,jdbcType=VARCHAR},
+            </if>
+            <if test="er_date != null" >
+                #{er_date,jdbcType=DATE}
+            </if>
+        </trim>
+    </insert>
+
+</mapper>

src/main/resources/mybatis/mapper/equipment/EquipmentTypeMapper.xml

@@ -6,13 +6,21 @@
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="et_code" property="et_code" jdbcType="INTEGER" />
         <result column="et_name" property="et_name" jdbcType="VARCHAR" />
+        <result column="et_rent" property="et_rent" jdbcType="INTEGER" />
+        <result column="et_mortagage" property="et_mortagage" jdbcType="INTEGER" />
     </resultMap>
 
     <!--获取所有数据-->
     <select id="getEquipmentTypes" resultType="com.ygj.yuemum.domain.equipment.EquipmentType" >
         select
-        id,et_code,et_name
+        id,et_code,et_name,et_rent,et_mortagage
         from equipment_type
     </select>
 
+    <select id="getEquipmentAmount" resultType="com.ygj.yuemum.domain.equipment.EquipmentType" parameterType="java.lang.Integer">
+        select
+        id,et_code,et_name,et_rent,et_mortagage
+        from equipment_type
+        where et_code = #{et_code,jdbcType=INTEGER}
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/equipment/EquipmenteHireDetailMapper.xml

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ygj.yuemum.dao.equipment.EquipmenteHireDetailDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.equipment.EquipmenteHireDetail" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="eh_code" property="eh_code" jdbcType="VARCHAR" />
+        <result column="et_type" property="et_type" jdbcType="INTEGER" />
+        <result column="ed_emcode" property="ed_emcode" jdbcType="VARCHAR" />
+        <result column="ed_rental" property="ed_rental" jdbcType="INTEGER" />
+        <result column="ed_startdate" property="ed_startdate" jdbcType="DATE" />
+        <result column="ed_enddate" property="ed_enddate" jdbcType="DATE" />
+    </resultMap>
+
+    <sql id="Base_Column_List" >
+        id,eh_code,et_type,ed_emcode,ed_rental,ed_startdate,ed_enddate
+    </sql>
+
+    <select id="getAll" resultMap="BaseResultMap" >
+        select
+        id,eh_code,et_type,ed_emcode,ed_rental,ed_startdate,ed_enddate
+        from equipment_hire_detail
+        order by id desc
+    </select>
+
+    <select id="queryEquipmenteHireDetail" resultMap="BaseResultMap" parameterType="com.ygj.yuemum.domain.equipment.EquipmenteHireDetail">
+        select
+        id,
+        eh_code,
+        fgetequipmenttypename(et_type) et_type,
+        et_type et_typeid,
+        ed_emcode,
+        fgetequipmentmortagage(et_type) ei_mortagage,
+        fgetequipmentrent(et_type)  ei_rent,
+        ed_startdate,
+        ed_enddate
+        from equipment_hire_detail
+        where 1=1
+        <if test="eh_code != null and eh_code != ''">
+            and eh_code = #{eh_code,jdbcType=VARCHAR}
+        </if>
+        order by id desc
+    </select>
+
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="Base_Column_List" />
+        from equipment_hire_detail
+        where eh_code = #{eh_code,jdbcType=VARCHAR}
+    </select>
+
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+        delete from equipment_hire_detail
+        where eh_code = #{eh_code,jdbcType=VARCHAR}
+    </delete>
+
+    <!-- 插入一条培训信息 -->
+    <insert id="insertSelective" parameterType="com.ygj.yuemum.domain.equipment.EquipmenteHireDetail" >
+        insert into equipment_hire_detail
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="eh_code != null" >
+                eh_code,
+            </if>
+            <if test="et_type != null" >
+                et_type,
+            </if>
+            <if test="ed_emcode != null" >
+                ed_emcode,
+            </if>
+            <if test="ed_rental != null" >
+                ed_rental,
+            </if>
+            <if test="ed_startdate != null" >
+                ed_startdate,
+            </if>
+            <if test="ed_enddate != null" >
+                ed_enddate
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="eh_code != null" >
+                #{eh_code,jdbcType=VARCHAR},
+            </if>
+            <if test="et_type != null" >
+                #{et_type,jdbcType=INTEGER},
+            </if>
+            <if test="ed_emcode != null" >
+                #{ed_emcode,jdbcType=VARCHAR},
+            </if>
+            <if test="ed_rental != null" >
+                #{ed_rental,jdbcType=INTEGER},
+            </if>
+            <if test="ed_startdate != null" >
+                #{ed_startdate,jdbcType=DATE},
+            </if>
+            <if test="ed_enddate != null" >
+                #{ed_enddate,jdbcType=DATE}
+            </if>
+        </trim>
+    </insert>
+
+    <!-- 根据id更新一条培训信息 -->
+    <update id="updateByPrimaryKeySelective" parameterType="com.ygj.yuemum.domain.equipment.EquipmenteHireDetail" >
+        update equipment_hire_detail
+        <set >
+            <if test="et_type != null" >
+                et_type = #{et_type,jdbcType=INTEGER},
+            </if>
+            <if test="ed_emcode != null" >
+                ed_emcode = #{ed_emcode,jdbcType=VARCHAR},
+            </if>
+            <if test="ed_rental != null" >
+                ed_rental = #{ed_rental,jdbcType=INTEGER},
+            </if>
+            <if test="ed_startdate != null" >
+                ed_startdate = #{ed_startdate,jdbcType=DATE},
+            </if>
+            <if test="ed_enddate != null" >
+                ed_enddate = #{ed_enddate,jdbcType=DATE}
+            </if>
+        </set>
+        where eh_code = #{eh_code,jdbcType=INTEGER}
+    </update>
+</mapper>

src/main/resources/mybatis/mapper/equipment/EquipmenteHireHeadMapper.xml

@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ygj.yuemum.dao.equipment.EquipmenteHireHeadDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.equipment.EquipmenteHireHead" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="eh_code" property="eh_code" jdbcType="VARCHAR" />
+        <result column="eh_mortagage" property="eh_mortagage" jdbcType="INTEGER" />
+        <result column="eh_rental" property="eh_rental" jdbcType="INTEGER" />
+        <result column="eh_cmname" property="eh_cmname" jdbcType="VARCHAR" />
+        <result column="eh_cmphone" property="eh_cmphone" jdbcType="VARCHAR" />
+        <result column="eh_cmidcard" property="eh_cmidcard" jdbcType="VARCHAR" />
+        <result column="eh_cmaddress" property="eh_cmaddress" jdbcType="VARCHAR" />
+        <result column="eh_usercode" property="eh_usercode" jdbcType="VARCHAR" />
+        <result column="eh_date" property="eh_date" jdbcType="DATE" />
+        <result column="eh_status" property="eh_status" jdbcType="INTEGER" />
+    </resultMap>
+
+    <sql id="Base_Column_List" >
+        id,eh_code,eh_mortagage,eh_rental,eh_cmname,eh_cmphone,eh_cmidcard,eh_cmaddress,eh_usercode,eh_date,eh_status
+    </sql>
+
+    <select id="getAll" resultMap="BaseResultMap" >
+        SELECT
+            eh_code,
+            eh_cmname,
+            eh_cmphone,
+            eh_rental,
+            eh_mortagage,
+            eh_status,
+            eh_date
+        FROM
+            equipment_hire_head
+        order by eh_date desc , eh_status asc
+    </select>
+
+    <select id="getSeq" resultType="java.lang.Integer" >
+        select
+        count(1)
+        from equipment_hire_head
+        where eh_date = date_format(now(),'%Y-%m-%d')
+    </select>
+
+    <select id="queryEquipmenteHireHead" resultMap="BaseResultMap" parameterType="com.ygj.yuemum.domain.equipment.EquipmenteHireHead">
+        select
+            equipment_hire_head.eh_code,
+            equipment_hire_head.eh_cmname,
+            equipment_hire_head.eh_cmphone,
+            equipment_hire_head.eh_rental,
+            equipment_hire_head.eh_mortagage,
+            equipment_hire_head.eh_status,
+            equipment_hire_head.eh_date
+        from equipment_hire_head
+        where eh_code in (
+            SELECT
+            equipment_hire_head.eh_code
+            FROM
+            equipment_hire_head
+            LEFT JOIN equipment_hire_detail ON equipment_hire_head.eh_code = equipment_hire_detail.eh_code
+            where 1=1
+            <if test="eh_code != null and eh_code != ''">and equipment_hire_head.eh_code = #{eh_code,jdbcType=VARCHAR}
+            </if>
+                <if test="eh_status != null and eh_status != ''">
+                    and equipment_hire_head.eh_status = #{eh_status,jdbcType=INTEGER}
+                </if>
+                <if test="eh_date != null and eh_date != ''">
+                    and equipment_hire_head.eh_date = #{eh_date,jdbcType=DATE}
+                </if>
+                <if test="eh_usercode != null and eh_usercode != ''">
+                    and equipment_hire_head.eh_usercode = #{eh_usercode,jdbcType=VARCHAR}
+                </if>
+                <if test="eh_cmphone != null and eh_cmphone != ''">
+                    and equipment_hire_head.eh_cmphone = #{eh_cmphone,jdbcType=VARCHAR}
+                </if>
+                <if test="eh_cmname != null and eh_cmname != ''">
+                    and equipment_hire_head.eh_cmname = #{eh_cmname,jdbcType=VARCHAR}
+                </if>
+                <if test="eh_cmaddress != null and eh_cmaddress != ''">
+                    and equipment_hire_head.eh_cmaddress like "%"#{eh_cmaddress,jdbcType=VARCHAR}"%"
+                </if>
+                <if test="eh_cmidcard != null and eh_cmidcard != ''">
+                    and equipment_hire_head.eh_cmidcard = #{eh_cmidcard,jdbcType=VARCHAR}
+                </if>
+                <if test="eh_rental != null and eh_rental != ''">
+                    and equipment_hire_head.eh_rental = #{eh_rental,jdbcType=INTEGER}
+                </if>
+                <if test="et_type != null and eh_mortagage != ''">
+                    and eequipment_hire_head.h_mortagage = #{eh_mortagage,jdbcType=INTEGER}
+                </if>
+                <if test="et_type != null and et_type != ''">
+                    and equipment_hire_detail.et_type = #{et_type,jdbcType=INTEGER}
+                </if>
+                <if test="ed_emcode != null and ed_emcode != ''">
+                    and equipment_hire_detail.ed_emcode = #{ed_emcode,jdbcType=VARCHAR}
+                </if>
+                <if test="ed_startdate != null and ed_startdate != ''">
+                    and equipment_hire_detail.ed_startdate = #{ed_startdate,jdbcType=DATE}
+                </if>
+                <if test="ed_enddate != null and ed_enddate != ''">
+                    and equipment_hire_detail.ed_enddate = #{ed_enddate,jdbcType=DATE}
+                </if>
+        )
+        ORDER BY
+        equipment_hire_head.eh_date desc,
+        equipment_hire_head.eh_status ASC
+    </select>
+
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="Base_Column_List" />
+        from equipment_hire_head
+        where eh_code = #{eh_code,jdbcType=INTEGER}
+    </select>
+
+    <select id="getEquipmenteHireHead" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="Base_Column_List" />
+        from equipment_hire_head
+        where eh_code = #{eh_code,jdbcType=INTEGER}
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+        delete from equipment_hire_head
+        where eh_code = #{eh_code,jdbcType=VARCHAR}
+    </delete>
+
+    <!-- 插入一条培训信息 -->
+    <insert id="insertSelective" parameterType="com.ygj.yuemum.domain.equipment.EquipmenteHireHead" >
+        insert into equipment_hire_head
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="eh_code != null" >
+                eh_code,
+            </if>
+            <if test="eh_mortagage != null" >
+                eh_mortagage,
+            </if>
+            <if test="eh_rental != null" >
+                eh_rental,
+            </if>
+            <if test="eh_cmname != null" >
+                eh_cmname,
+            </if>
+            <if test="eh_cmphone != null" >
+                eh_cmphone,
+            </if>
+            <if test="eh_cmidcard != null" >
+                eh_cmidcard,
+            </if>
+            <if test="eh_cmaddress != null" >
+                eh_cmaddress,
+            </if>
+            <if test="eh_usercode != null" >
+                eh_usercode,
+            </if>
+            <if test="eh_date != null" >
+                eh_date,
+            </if>
+            <if test="eh_status != null" >
+                eh_status
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="eh_code != null" >
+                #{eh_code,jdbcType=VARCHAR},
+            </if>
+            <if test="eh_mortagage != null" >
+                #{eh_mortagage,jdbcType=INTEGER},
+            </if>
+            <if test="eh_rental != null" >
+                #{eh_rental,jdbcType=INTEGER},
+            </if>
+            <if test="eh_cmname != null" >
+                #{eh_cmname,jdbcType=VARCHAR},
+            </if>
+            <if test="eh_cmphone != null" >
+                #{eh_cmphone,jdbcType=VARCHAR},
+            </if>
+            <if test="eh_cmidcard != null" >
+                #{eh_cmidcard,jdbcType=VARCHAR},
+            </if>
+            <if test="eh_cmaddress != null" >
+                #{eh_cmaddress,jdbcType=VARCHAR},
+            </if>
+            <if test="eh_usercode != null" >
+                #{eh_usercode,jdbcType=VARCHAR},
+            </if>
+            <if test="eh_date != null" >
+                #{eh_date,jdbcType=DATE},
+            </if>
+            <if test="eh_status != null" >
+                #{eh_status,jdbcType=DATE}
+            </if>
+        </trim>
+    </insert>
+
+    <!-- 根据id更新一条培训信息 -->
+    <update id="updateByPrimaryKeySelective" parameterType="com.ygj.yuemum.domain.equipment.EquipmenteHireHead" >
+        update equipment_hire_head
+        <set >
+            <if test="eh_mortagage != null" >
+                eh_mortagage = #{eh_mortagage,jdbcType=INTEGER},
+            </if>
+            <if test="eh_rental != null" >
+                eh_rental = #{eh_rental,jdbcType=INTEGER},
+            </if>
+            <if test="eh_cmname != null" >
+                eh_cmname = #{eh_cmname,jdbcType=VARCHAR},
+            </if>
+            <if test="eh_cmphone != null" >
+                eh_cmphone = #{eh_cmphone,jdbcType=VARCHAR},
+            </if>
+            <if test="eh_cmidcard != null" >
+                eh_cmidcard = #{eh_cmidcard,jdbcType=VARCHAR},
+            </if>
+            <if test="eh_cmaddress != null" >
+                eh_cmaddress = #{eh_cmaddress,jdbcType=VARCHAR},
+            </if>
+            <if test="eh_usercode != null" >
+                eh_usercode = #{eh_usercode,jdbcType=VARCHAR},
+            </if>
+            <if test="eh_date != null" >
+                eh_date = #{eh_date,jdbcType=DATE},
+            </if>
+            <if test="eh_status != null" >
+                eh_status = #{eh_status,jdbcType=DATE}
+            </if>
+        </set>
+        where eh_code = #{eh_code,jdbcType=INTEGER}
+    </update>
+</mapper>

src/main/resources/mybatis/mapper/pay/CustomerPayMapper.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ygj.yuemum.dao.pay.CustomerPayDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.pay.CustomerPay" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="cp_ordertype" property="cp_ordertype" jdbcType="INTEGER" />
+        <result column="cp_orderno" property="cp_orderno" jdbcType="VARCHAR" />
+        <result column="cp_channel" property="cp_channel" jdbcType="INTEGER" />
+        <result column="cp_discount" property="cp_discount" jdbcType="INTEGER" />
+        <result column="cp_paytype" property="cp_paytype" jdbcType="VARCHAR" />
+        <result column="cp_payamount" property="cp_payamount" jdbcType="INTEGER" />
+        <result column="cp_comments" property="cp_comments" jdbcType="VARCHAR" />
+        <result column="cp_usercode" property="cp_usercode" jdbcType="VARCHAR" />
+        <result column="cp_date" property="cp_date" jdbcType="DATE" />
+    </resultMap>
+
+    <sql id="Base_Column_List" >
+        id, cp_ordertype,cp_orderno,cp_channel,cp_discount,cp_paytype,cp_payamount,cp_comments,cp_usercode,cp_date
+    </sql>
+    <!-- 此处添加查询信息-->
+    <select id="selectCustomerPay" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        id, cp_ordertype,cp_orderno,cp_channel,cp_discount,fgetequipmenpayname(cp_paytype) cp_paytype,cp_payamount,cp_comments,cp_usercode,cp_date
+        from customer_pay
+        where cp_orderno = #{cp_orderno,jdbcType=VARCHAR}
+        order by id desc
+    </select>
+
+    <!-- 插入一条培训信息 -->
+    <insert id="insertCustomerPay" parameterType="com.ygj.yuemum.domain.pay.CustomerPay" >
+        insert into customer_pay
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="cp_ordertype != null" >
+                cp_ordertype,
+            </if>
+            <if test="cp_orderno != null" >
+                cp_orderno,
+            </if>
+            <if test="cp_channel != null" >
+                cp_channel,
+            </if>
+            <if test="cp_discount != null" >
+                cp_discount,
+            </if>
+            <if test="cp_paytype != null" >
+                cp_paytype,
+            </if>
+            <if test="cp_payamount != null" >
+                cp_payamount,
+            </if>
+            <if test="cp_comments != null" >
+                cp_comments,
+            </if>
+            <if test="cp_usercode != null" >
+                cp_usercode,
+            </if>
+            <if test="cp_date != null" >
+                cp_date
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="cp_ordertype != null" >
+                #{cp_ordertype,jdbcType=INTEGER},
+            </if>
+            <if test="cp_orderno != null" >
+                #{cp_orderno,jdbcType=VARCHAR},
+            </if>
+            <if test="cp_channel != null" >
+                #{cp_channel,jdbcType=INTEGER},
+            </if>
+            <if test="cp_discount != null" >
+                #{cp_discount,jdbcType=INTEGER},
+            </if>
+            <if test="cp_paytype != null" >
+                #{cp_paytype,jdbcType=INTEGER},
+            </if>
+            <if test="cp_payamount != null" >
+                #{cp_payamount,jdbcType=INTEGER},
+            </if>
+            <if test="cp_comments != null" >
+                #{cp_comments,jdbcType=VARCHAR},
+            </if>
+            <if test="cp_usercode != null" >
+                #{cp_usercode,jdbcType=VARCHAR},
+            </if>
+            <if test="cp_date != null" >
+                #{cp_date,jdbcType=DATE}
+            </if>
+        </trim>
+    </insert>
+</mapper>

src/main/resources/mybatis/mapper/pay/DiscountChannelMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ygj.yuemum.dao.pay.DiscountChannelDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.pay.DiscountChannel" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="dc_code" property="dc_code" jdbcType="INTEGER" />
+        <result column="dc_name" property="dc_name" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getDiscountChannelSelect" resultType="com.ygj.yuemum.domain.pay.DiscountChannel" >
+        select
+        id,dc_code,dc_name
+        from discount_channel
+    </select>
+
+</mapper>

src/main/resources/mybatis/mapper/pay/PayMentsMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ygj.yuemum.dao.pay.PayMentsDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.pay.PayMents" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="pm_code" property="pm_code" jdbcType="VARCHAR" />
+        <result column="pm_name" property="pm_name" jdbcType="VARCHAR" />
+        <result column="pm_desc" property="pm_desc" jdbcType="VARCHAR" />
+        <result column="pm_order" property="pm_order" jdbcType="INTEGER" />
+        <result column="pm_config" property="pm_config" jdbcType="VARCHAR" />
+        <result column="pm_enable" property="pm_enable" jdbcType="INTEGER" />
+        <result column="pm_isonline" property="pm_isonline" jdbcType="INTEGER" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getPayMentSelect" resultType="com.ygj.yuemum.domain.pay.PayMents" >
+        select
+        id,pm_code,pm_name,pm_desc,pm_order,pm_config,pm_enable,pm_isonline
+        from payments
+    </select>
+
+    <select id="getPayMentAll" resultType="com.ygj.yuemum.domain.pay.PayMents" >
+        select
+        id,pm_code,pm_name,pm_desc,pm_order,pm_config,pm_enable,pm_isonline
+        from payments
+    </select>
+
+</mapper>