crud

pom.xml

@@ -5,9 +5,8 @@
 
 	<groupId>com.ygj</groupId>
 	<artifactId>yuemum</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1</version>
 	<packaging>jar</packaging>
-
 	<name>yuemum</name>
 	<description>Demo project for Spring Boot</description>
 
@@ -47,6 +46,12 @@
 			<version>1.2.31</version>
 		</dependency>
 
+		<!--dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
+			<scope>provided</scope>
+		</dependency-->
+
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>

src/main/java/com/ygj/yuemum/YueMumApplication.java

@@ -14,3 +14,15 @@ public class YueMumApplication {
         SpringApplication.run(YueMumApplication.class, args);
     }
 }
+//public class YueMumApplication extends SpringBootServletInitializer implements WebApplicationInitializer {
+//
+//    @Override
+//    protected SpringApplicationBuilder configure(SpringApplicationBuilder application){
+//
+//        return application.sources(YueMumApplication.class);
+//    }
+//
+//    public static void main(String[] args) {
+//        SpringApplication.run(YueMumApplication.class, args);
+//    }
+//}

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

@@ -50,9 +50,14 @@ public class EquipmenteHireDetailController {
         return jso;
     }
 
+    @GetMapping("/checkEqEmcode")
+    public String checkEqEmcode (@RequestParam("eh_code") String eh_code){
+        return equipmenteHireDetailService.checkEqEmcode(eh_code);
+    }
+
     @GetMapping("/getCustomerEq")
-    public List<EquipmenteHireDetail> getCustomerEq (@RequestParam("eh_cmname") String eh_cmname){
-        return equipmenteHireDetailService.getCustomerEq(eh_cmname);
+    public List<EquipmenteHireDetail> getCustomerEq (@RequestParam("eh_cmidcard") String eh_cmidcard){
+        return equipmenteHireDetailService.getCustomerEq(eh_cmidcard);
     }
 
 }

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

@@ -17,8 +17,8 @@ public class EquipmenteHireHeadController {
 
 
     @GetMapping("/getAllEquipmenteHireHeads")
-    public String getAllEquipmenteHireHeads(@RequestParam("page") Integer page,@RequestParam("limit") Integer limit) {
-        Map<String, Object> equipmenteHireHeadServiceAll = equipmenteHireHeadService.getAll(page,limit);
+    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;
     }
@@ -66,4 +66,10 @@ public class EquipmenteHireHeadController {
         return equipmenteHireHeadService.equipmentSettle(equipmenteHireHead);
     }
 
+    @PostMapping("/WxPayReturn")
+    public int WxPayReturn(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        equipmenteHireHead.setEh_status(2);
+        return equipmenteHireHeadService.updateEqorderStatus(equipmenteHireHead);
+    }
+
 }

src/main/java/com/ygj/yuemum/controller/global/PackageItemController.java

@@ -0,0 +1,38 @@
+package com.ygj.yuemum.controller.global;
+
+
+import com.ygj.yuemum.domain.global.PackageItem;
+import com.ygj.yuemum.service.global.PackageItemService;
+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 PackageItemController {
+
+    @Autowired
+    private PackageItemService packageItemService;
+    @GetMapping("/getPackageItems")
+    public List<PackageItem> getPackageSelect() {
+        List<PackageItem> packageItems = packageItemService.getPackageItems();
+        return packageItems;
+    }
+    @GetMapping("/getPIGroups")
+    public List<PackageItem> getPIGroups() {
+        List<PackageItem> packageItems = packageItemService.getPIGroups();
+        return packageItems;
+    }
+    @GetMapping("/getPIClasses")
+    public List<PackageItem> getPIClasses() {
+        List<PackageItem> packageItems = packageItemService.getPIClasses();
+        return packageItems;
+    }
+    @GetMapping("/getPIServices")
+    public List<PackageItem> getPIServices() {
+        List<PackageItem> packageItems = packageItemService.getPIServices();
+        return packageItems;
+    }
+
+}

src/main/java/com/ygj/yuemum/controller/global/PackagesController.java

@@ -5,6 +5,7 @@ import com.ygj.yuemum.domain.global.Packages;
 import com.ygj.yuemum.service.global.PackagesService;
 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;
@@ -26,4 +27,21 @@ public class PackagesController {
         return packages;
     }
 
+    @GetMapping("/getPackageShowname")
+    public List<Packages> getPackageShowname() {
+        List<Packages> packages = packagesService.getPackageShowname();
+        return packages;
+    }
+    @GetMapping("/getPackageLists")
+    public List<Packages> getPackageLists() {
+        List<Packages> packages = packagesService.getPackageLists();
+        return packages;
+    }
+    @GetMapping("/getPackageDetail")
+    public Packages getPackageDetail(@RequestParam("p_code") String p_code) {
+        Packages packager = packagesService.getPackageDetail(p_code);
+        return packager;
+    }
+
+
 }

src/main/java/com/ygj/yuemum/controller/wxmini/WXCustomerServiceController.java

@@ -0,0 +1,27 @@
+package com.ygj.yuemum.controller.wxmini;
+
+
+import com.ygj.yuemum.service.wxmini.WXCustomerService;
+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;
+
+@RestController
+public class WXCustomerServiceController {
+
+    @Autowired
+    private WXCustomerService wxCustomerService;
+    private String token = "YueSuoNo1";
+
+    @GetMapping("/checkSignature")
+    public String getWXUser(@RequestParam("signature") String signature, @RequestParam("timestamp") String timestamp, @RequestParam("nonce") String nonce, @RequestParam("echostr") String echostr) {
+
+        if (wxCustomerService.checkSignature(signature.trim(), timestamp.trim(), nonce.trim(), echostr.trim(), token)) {
+            return echostr.trim();
+        } else {
+            return null;
+        }
+    }
+
+}

src/main/java/com/ygj/yuemum/controller/wxmini/WXYueSuoController.java

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.controller.wxmini;
+
+
+import com.ygj.yuemum.domain.wxmini.WXYueSuo;
+import com.ygj.yuemum.service.wxmini.WXYueSuoService;
+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 WXYueSuoController {
+
+    @Autowired
+    private WXYueSuoService wxYueSuoService;
+    @GetMapping("/getYueSuo")
+    public List<WXYueSuo> getYueSuo() {
+        List<WXYueSuo> wxYueSuos = wxYueSuoService.getYueSuo();
+        return wxYueSuos;
+    }
+}

src/main/java/com/ygj/yuemum/dao/customer/CustomerBookingDao.java

@@ -11,4 +11,5 @@ public interface CustomerBookingDao {
     List<CustomerBooking> selectCustomerBooking(String bk_phone);
     List<CustomerBooking> selectAll();
     int insertCustomerBooking(CustomerBooking customerBooking);
+    int checkBooking (CustomerBooking customerBooking);
 }

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

@@ -14,5 +14,6 @@ public interface EquipmenteHireDetailDao {
     int deleteByPrimaryKey(String eh_code);
     int insertSelective(EquipmenteHireDetail record);
     int updateByPrimaryKeySelective(EquipmenteHireDetail record);
-    List<EquipmenteHireDetail> getCustomerEq(String eh_cmname);
+    List<EquipmenteHireDetail> getCustomerEq(String eh_cmidcard);
+    String checkEqEmcode(String eh_code);
 }

src/main/java/com/ygj/yuemum/dao/global/PackageItemDao.java

@@ -0,0 +1,15 @@
+package com.ygj.yuemum.dao.global;
+
+import com.ygj.yuemum.domain.global.PackageItem;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PackageItemDao {
+
+    List<PackageItem> getPackageItems();
+    List<PackageItem> getPIGroups();
+    List<PackageItem> getPIClasses();
+    List<PackageItem> getPIServices();
+}

src/main/java/com/ygj/yuemum/dao/global/PackagesDao.java

@@ -10,4 +10,7 @@ public interface PackagesDao {
 
     List<Packages> getPackageSelect();
     List<Packages> getPackageAll();
+    List<Packages> getPackageShowname();
+    List<Packages> getPackageLists();
+    Packages getPackageDetail(String p_code);
 }

src/main/java/com/ygj/yuemum/dao/wxmini/WXYueSuoDao.java

@@ -0,0 +1,12 @@
+package com.ygj.yuemum.dao.wxmini;
+
+import com.ygj.yuemum.domain.wxmini.WXYueSuo;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface WXYueSuoDao {
+
+    List<WXYueSuo> getYueSuo();
+}

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

@@ -10,6 +10,15 @@ public class EquipmentType {
     private String et_listurl;
     private String et_bannerurl;
     private String et_desc;
+    private Integer stock;
+
+    public Integer getStock() {
+        return stock;
+    }
+
+    public void setStock(Integer stock) {
+        this.stock = stock;
+    }
 
     public String getEt_desc() {
         return et_desc;

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

@@ -21,6 +21,24 @@ public class EquipmenteHireHead {
     private String ed_startdate;
     private String ed_enddate;
     private Integer eh_source;
+    private Double total;
+    private Double cp_discount;
+
+    public Double getTotal() {
+        return total;
+    }
+
+    public void setTotal(Double total) {
+        this.total = total;
+    }
+
+    public Double getCp_discount() {
+        return cp_discount;
+    }
+
+    public void setCp_discount(Double cp_discount) {
+        this.cp_discount = cp_discount;
+    }
 
     public Integer getEh_source() {
         return eh_source;

src/main/java/com/ygj/yuemum/domain/global/PackageItem.java

@@ -0,0 +1,67 @@
+package com.ygj.yuemum.domain.global;
+
+public class PackageItem {
+    private Integer id;
+    private Integer pi_groupid;
+    private String pi_groupname;
+    private Integer pi_classid;
+    private String pi_classname;
+    private String pi_service;
+    private String p_code;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getPi_groupid() {
+        return pi_groupid;
+    }
+
+    public void setPi_groupid(Integer pi_groupid) {
+        this.pi_groupid = pi_groupid;
+    }
+
+    public String getPi_groupname() {
+        return pi_groupname;
+    }
+
+    public void setPi_groupname(String pi_groupname) {
+        this.pi_groupname = pi_groupname;
+    }
+
+    public Integer getPi_classid() {
+        return pi_classid;
+    }
+
+    public void setPi_classid(Integer pi_classid) {
+        this.pi_classid = pi_classid;
+    }
+
+    public String getPi_classname() {
+        return pi_classname;
+    }
+
+    public void setPi_classname(String pi_classname) {
+        this.pi_classname = pi_classname;
+    }
+
+    public String getPi_service() {
+        return pi_service;
+    }
+
+    public void setPi_service(String pi_service) {
+        this.pi_service = pi_service;
+    }
+
+    public String getP_code() {
+        return p_code;
+    }
+
+    public void setP_code(String p_code) {
+        this.p_code = p_code;
+    }
+}

src/main/java/com/ygj/yuemum/domain/global/Packages.java

@@ -7,6 +7,69 @@ public class Packages {
     private String p_name;
     private Integer p_days;
     private Integer p_amount;
+    private String p_showname;
+    private Integer p_show;
+    private Integer p_seq;
+    private String p_listimg;
+    private String p_listdesc;
+    private String p_detailimg;
+    private String p_detaildesc;
+
+    public Integer getP_show() {
+        return p_show;
+    }
+
+    public void setP_show(Integer p_show) {
+        this.p_show = p_show;
+    }
+
+    public Integer getP_seq() {
+        return p_seq;
+    }
+
+    public void setP_seq(Integer p_seq) {
+        this.p_seq = p_seq;
+    }
+
+    public String getP_listimg() {
+        return p_listimg;
+    }
+
+    public void setP_listimg(String p_listimg) {
+        this.p_listimg = p_listimg;
+    }
+
+    public String getP_listdesc() {
+        return p_listdesc;
+    }
+
+    public void setP_listdesc(String p_listdesc) {
+        this.p_listdesc = p_listdesc;
+    }
+
+    public String getP_detailimg() {
+        return p_detailimg;
+    }
+
+    public void setP_detailimg(String p_detailimg) {
+        this.p_detailimg = p_detailimg;
+    }
+
+    public String getP_detaildesc() {
+        return p_detaildesc;
+    }
+
+    public void setP_detaildesc(String p_detaildesc) {
+        this.p_detaildesc = p_detaildesc;
+    }
+
+    public String getP_showname() {
+        return p_showname;
+    }
+
+    public void setP_showname(String p_showname) {
+        this.p_showname = p_showname;
+    }
 
     public Integer getP_type() {
         return p_type;

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

@@ -6,9 +6,9 @@ public class CustomerPay {
     private Integer cp_ordertype;
     private String cp_orderno;
     private Integer cp_channel;
-    private Integer cp_discount;
+    private Double cp_discount;
     private String cp_paytype;
-    private Integer cp_payamount;
+    private Double cp_payamount;
     private String cp_comments;
     private String cp_usercode;
     private String cp_date;
@@ -47,13 +47,8 @@ public class CustomerPay {
         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;
@@ -63,11 +58,19 @@ public class CustomerPay {
         this.cp_paytype = cp_paytype;
     }
 
-    public Integer getCp_payamount() {
+    public Double getCp_discount() {
+        return cp_discount;
+    }
+
+    public void setCp_discount(Double cp_discount) {
+        this.cp_discount = cp_discount;
+    }
+
+    public Double getCp_payamount() {
         return cp_payamount;
     }
 
-    public void setCp_payamount(Integer cp_payamount) {
+    public void setCp_payamount(Double cp_payamount) {
         this.cp_payamount = cp_payamount;
     }
 

src/main/java/com/ygj/yuemum/domain/wxmini/WXPromotion.java

@@ -8,6 +8,15 @@ public class WXPromotion {
     private String wp_href;
     private String wp_startdate;
     private String wp_enddate;
+    private String wp_isexpire;
+
+    public String getWp_isexpire() {
+        return wp_isexpire;
+    }
+
+    public void setWp_isexpire(String wp_isexpire) {
+        this.wp_isexpire = wp_isexpire;
+    }
 
     public Integer getId() {
         return id;

src/main/java/com/ygj/yuemum/domain/wxmini/WXYueSuo.java

@@ -0,0 +1,58 @@
+package com.ygj.yuemum.domain.wxmini;
+
+public class WXYueSuo {
+    private Integer id;
+    private Integer wy_type;
+    private String wy_position;
+    private Integer wy_seq;
+    private String wy_size;
+    private String wy_url;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getWy_type() {
+        return wy_type;
+    }
+
+    public void setWy_type(Integer wy_type) {
+        this.wy_type = wy_type;
+    }
+
+    public String getWy_position() {
+        return wy_position;
+    }
+
+    public void setWy_position(String wy_position) {
+        this.wy_position = wy_position;
+    }
+
+    public Integer getWy_seq() {
+        return wy_seq;
+    }
+
+    public void setWy_seq(Integer wy_seq) {
+        this.wy_seq = wy_seq;
+    }
+
+    public String getWy_size() {
+        return wy_size;
+    }
+
+    public void setWy_size(String wy_size) {
+        this.wy_size = wy_size;
+    }
+
+    public String getWy_url() {
+        return wy_url;
+    }
+
+    public void setWy_url(String wy_url) {
+        this.wy_url = wy_url;
+    }
+}

src/main/java/com/ygj/yuemum/service/customer/CustomerBookingService.java

@@ -27,7 +27,17 @@ public class CustomerBookingService {
     }
 
     public int insertCustomerBooking(CustomerBooking customerBooking){
-        return customerBookingDao.insertCustomerBooking(customerBooking);
+        try {
+            int check = customerBookingDao.checkBooking(customerBooking);
+            if(check > 0) {
+                return 99;
+            } else {
+                return customerBookingDao.insertCustomerBooking(customerBooking);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
     }
     public int insertEqCustomerBooking(CustomerBooking customerBooking){
         try{

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

@@ -76,9 +76,10 @@ public class EquipmenteHireDetailService {
         }
         return 1;
     }
-    public List<EquipmenteHireDetail> getCustomerEq(String eh_cmname) {
-        return equipmenteHireDetailDao.getCustomerEq(eh_cmname);
+    public List<EquipmenteHireDetail> getCustomerEq(String eh_cmidcard) {
+        return equipmenteHireDetailDao.getCustomerEq(eh_cmidcard);
+    }
+    public String checkEqEmcode(String eh_code) {
+        return  equipmenteHireDetailDao.checkEqEmcode(eh_code);
     }
-
-
 }

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

@@ -8,8 +8,10 @@ import com.ygj.yuemum.domain.equipment.EquipmentInfo;
 import com.ygj.yuemum.domain.equipment.EquipmenteHireDetail;
 import com.ygj.yuemum.domain.equipment.EquipmenteHireHead;
 import com.ygj.yuemum.domain.modoo.ModooEquipmentLog;
+import com.ygj.yuemum.domain.pay.CustomerPay;
 import com.ygj.yuemum.service.modoo.ModooApiService;
 import com.ygj.yuemum.service.modoo.ModooEquipmentLogService;
+import com.ygj.yuemum.service.pay.CustomerPayService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +32,8 @@ public class EquipmenteHireHeadService {
     private ModooApiService modooApiService;
     @Autowired
     private ModooEquipmentLogService modooEquipmentLogService;
+    @Autowired
+    private CustomerPayService customerPayService;
 
     public Map<String, Object> queryEquipmenteHireHead(EquipmenteHireHead equipmenteHireHead) {
         PageHelper.startPage(equipmenteHireHead.getPage(), equipmenteHireHead.getLimit());
@@ -171,9 +175,6 @@ public class EquipmenteHireHeadService {
             return 0;
         }
 
-        //modoo if(type==1)
-
-        // log modoo
 
         return 1;
     }
@@ -188,37 +189,19 @@ public class EquipmenteHireHeadService {
 
     public int addEquipmenteHireHeadOnline(EquipmenteHireHead equipmenteHireHead) {
         try {
-            DecimalFormat df = new DecimalFormat("000");
-            int seq = equipmenteHireHeadDao.getSeq() + 1;
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-            SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");
-            String orderno = "EH" + sdf.format(new Date()) + df.format(seq);
-            //add Head
-            equipmenteHireHead.setEh_code(orderno);
-            equipmenteHireHead.setEh_status(1);
-            equipmenteHireHead.setEh_source(1);
-            Date date = sdfdate.parse(equipmenteHireHead.getEh_date());
-            equipmenteHireHead.setEh_date(sdfdate.format(date));
+            SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             equipmenteHireHeadDao.insertSelective(equipmenteHireHead);
-            //add Detail auto distribution
-            EquipmentInfo equipmentInfo =  equipmentInfoService.getAutoDisEquipment();
-            if (equipmentInfo == null) {
-                return 2;//无可租设备
-            } else {
-                // insert into Detail
-                EquipmenteHireDetail ed = new EquipmenteHireDetail();
-                ed.setEt_type(equipmentInfo.getEt_code());
-                ed.setEd_emcode(equipmentInfo.getEi_code());
-                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);
-                // lock EquipmentInfo
-                equipmentInfo.setEi_status(2);
-                equipmentInfoService.updateEIStatus(equipmentInfo);
-            }
+
+            CustomerPay customerPay = new CustomerPay();
+            customerPay.setCp_ordertype(1);
+            customerPay.setCp_orderno(equipmenteHireHead.getEh_code());
+            customerPay.setCp_paytype("2");
+            customerPay.setCp_payamount(equipmenteHireHead.getTotal());
+            customerPay.setCp_discount(equipmenteHireHead.getCp_discount());
+            customerPay.setCp_usercode("online");
+            customerPay.setCp_date(sdfdate.format(new Date()));
+
+            customerPayService.insertCustomerPayOnLine(customerPay);
         } catch (Exception ex) {
             ex.printStackTrace();
             return 0;

src/main/java/com/ygj/yuemum/service/global/PackageItemService.java

@@ -0,0 +1,32 @@
+package com.ygj.yuemum.service.global;
+
+import com.ygj.yuemum.dao.global.PackageItemDao;
+import com.ygj.yuemum.domain.global.PackageItem;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PackageItemService {
+
+    @Autowired
+
+    private PackageItemDao packageItemDao;
+
+    public List<PackageItem> getPackageItems() {
+        return packageItemDao.getPackageItems();
+    }
+    public List<PackageItem> getPIGroups() {
+        return packageItemDao.getPIGroups();
+    }
+    public List<PackageItem> getPIClasses() {
+        return packageItemDao.getPIClasses();
+    }
+    public List<PackageItem> getPIServices() {
+        return packageItemDao.getPIServices();
+    }
+
+
+
+}

src/main/java/com/ygj/yuemum/service/global/PackagesService.java

@@ -21,4 +21,14 @@ public class PackagesService {
         return packagesDao.getPackageAll();
     }
 
+    public List<Packages> getPackageShowname() {
+        return packagesDao.getPackageShowname();
+    }
+    public List<Packages> getPackageLists() {
+        return packagesDao.getPackageLists();
+    }
+    public Packages getPackageDetail(String p_code) {
+        return packagesDao.getPackageDetail(p_code);
+    }
+
 }

src/main/java/com/ygj/yuemum/service/global/WeChatInfoService.java

@@ -33,8 +33,14 @@ public class WeChatInfoService {
     private WXUserService wxUserService;
     public static String APPID = "wx52852a3c47540fad";
     public static String APPSECRET = "31e4eef58038830327eb88661e3a681f";
-    public static String MINIAPPID = "wxcf2db527c41184e8";
-    public static String MINIAPPSECRET = "6534f385c5a3a0985ea7bead4f5c545f";
+    //生产
+//    public static String MINIAPPID = "wx20a080f3bf83ba47";
+//    public static String MINIAPPSECRET = "61021776790449943ba5f40288efa0d6";
+    //测试
+    public static String MINIAPPID = "wx1c3ef3300b74ed86";
+    public static String MINIAPPSECRET = "ba5624bc087921d5a5832da9193e40f1";
+
+
     public static String GRANT_TYPE = "client_credential";
     public static String JSAPI_TICKET_TYPE = "jsapi";
     public static String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token";

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

@@ -61,4 +61,14 @@ public class CustomerPayService {
         return 1;
     }
 
+    public int insertCustomerPayOnLine(CustomerPay customerPay) {
+        try{
+            customerPayDao.insertCustomerPay(customerPay);
+
+        }catch (Exception ex){
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
+    }
 }

src/main/java/com/ygj/yuemum/service/wxmini/WXCustomerService.java

@@ -0,0 +1,52 @@
+package com.ygj.yuemum.service.wxmini;
+
+import org.springframework.stereotype.Service;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+@Service
+public class WXCustomerService {
+
+    public boolean checkSignature(String signature, String timestamp, String nonce, String echostr, String token) {
+        String[] strings = new String[]{token,timestamp,nonce};
+        StringBuilder builder = new StringBuilder();
+        Arrays.sort(strings);
+        for (int i=0;i<strings.length;i++){
+            builder.append(strings[i]);
+        }
+        String res = sha1(builder.toString());
+        if (res.equals(signature)) {
+            return true;
+        }
+        return  false;
+    }
+    private String sha1(String str){
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA-1");
+            byte[] bytes = digest.digest(str.getBytes());
+            return toHex(bytes);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    private String toHex(byte[] bytes){
+
+        String str = "";
+        for(byte b : bytes){
+            char[] chars = new char[]{'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'};
+            char[] temp = new char[2];
+            temp[0] = chars[(b>>>4)&0x0F];
+            temp[1] = chars[b&0x0F];
+
+            str += new String(temp);
+        }
+        return str;
+    }
+
+
+
+}

src/main/java/com/ygj/yuemum/service/wxmini/WXYueSuoService.java

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.service.wxmini;
+
+import com.ygj.yuemum.dao.wxmini.WXYueSuoDao;
+import com.ygj.yuemum.domain.wxmini.WXYueSuo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class WXYueSuoService {
+
+    @Autowired
+
+    private WXYueSuoDao wxYueSuoDao;
+
+    public List<WXYueSuo> getYueSuo() {
+        return wxYueSuoDao.getYueSuo();
+    }
+
+
+}

src/main/resources/mybatis/mapper/customer/CustomerBookingMapper.xml

@@ -29,6 +29,22 @@
         from customer_booking
     </select>
 
+    <select id="checkBooking" resultType="java.lang.Integer" parameterType="com.ygj.yuemum.domain.customer.CustomerBooking">
+        select
+       count(1)
+        from customer_booking
+        where 1=1
+        <if test="bk_phone != null and bk_phone != ''">
+            and bk_phone = #{bk_phone,jdbcType=INTEGER}
+        </if>
+        <if test="bk_date != null and bk_date != ''">
+            and bk_date = #{bk_date,jdbcType=INTEGER}
+        </if>
+        <if test="bk_type != null and bk_type != ''">
+            and bk_type = #{bk_type,jdbcType=INTEGER}
+        </if>
+    </select>
+
     <!-- 插入一条培训信息 -->
     <insert id="insertCustomerBooking" parameterType="com.ygj.yuemum.domain.customer.CustomerBooking" >
         insert into customer_booking

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

@@ -16,9 +16,22 @@
 
     <!--获取所有数据-->
     <select id="getEquipmentTypes" resultType="com.ygj.yuemum.domain.equipment.EquipmentType" >
-        select
-        id,et_code,et_name,et_rent,et_mortagage,et_listurl,et_url,et_bannerurl,et_desc
-        from equipment_type
+        SELECT
+            id,
+            tta.et_code,
+            et_name,
+            et_rent,
+            et_mortagage,
+            et_listurl,
+            et_url,
+            et_bannerurl,
+            et_desc,
+            ifnull(ttb.stock,0) stock
+            FROM
+            equipment_type tta
+            LEFT JOIN (
+            SELECT  et_code, count(*) stock FROM equipment_info WHERE ei_status = 1 GROUP BY et_code
+            ) ttb ON tta.et_code = ttb.et_code
     </select>
 
     <select id="getEquipmentAmount" resultType="com.ygj.yuemum.domain.equipment.EquipmentType" parameterType="java.lang.Integer">

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

@@ -33,7 +33,8 @@
         fgetequipmentmortagage(et_type) ei_mortagage,
         fgetequipmentrent(et_type)  ei_rent,
         ed_startdate,
-        ed_days
+        ed_days,
+        ed_enddate
         from equipment_hire_detail
         where 1=1
         <if test="eh_code != null and eh_code != ''">
@@ -61,7 +62,7 @@
             ta.eh_status
         from equipment_hire_detail tb ,equipment_hire_head ta
         where tb.eh_code = ta.eh_code
-        and eh_cmname = #{eh_cmname,jdbcType=VARCHAR}
+        and eh_cmidcard = #{eh_cmidcard,jdbcType=VARCHAR}
         order by  FIELD(ta.eh_status , 2,9,4) , ta.id desc
     </select>
 
@@ -130,4 +131,12 @@
         where eh_code = #{eh_code,jdbcType=VARCHAR}
         and ed_emcode = #{ed_emcode,jdbcType=VARCHAR}
     </update>
+
+    <select id="checkEqEmcode" parameterType="java.lang.String" resultType="java.lang.String" >
+        select
+        ed_emcode
+        from equipment_hire_detail
+        where eh_code = #{eh_code,jdbcType=INTEGER}
+    </select>
+
 </mapper>

src/main/resources/mybatis/mapper/global/PackageItemMapper.xml

@@ -0,0 +1,39 @@
+<?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.global.PackageItemDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.global.PackageItem" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="pi_groupid" property="pi_groupid" jdbcType="INTEGER" />
+        <result column="pi_groupname" property="pi_groupname" jdbcType="VARCHAR" />
+        <result column="pi_classid" property="pi_classid" jdbcType="INTEGER" />
+        <result column="pi_classname" property="pi_classname" jdbcType="VARCHAR" />
+        <result column="pi_service" property="pi_service" jdbcType="VARCHAR" />
+        <result column="p_code" property="p_code" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getPackageItems" resultType="com.ygj.yuemum.domain.global.PackageItem" >
+        select
+        id,pi_groupid,pi_groupname,pi_classid,pi_classname,pi_service,p_code
+        from package_item
+    </select>
+
+    <select id="getPIGroups" resultType="com.ygj.yuemum.domain.global.PackageItem" >
+        select pi_groupid,pi_groupname from package_item group by pi_groupid
+        order by 1 asc
+    </select>
+
+    <select id="getPIClasses" resultType="com.ygj.yuemum.domain.global.PackageItem" >
+        select pi_groupid,pi_classid,pi_classname from package_item group by pi_groupid,pi_classid
+        order by pi_groupid asc,pi_classid asc
+    </select>
+
+
+    <select id="getPIServices" resultType="com.ygj.yuemum.domain.global.PackageItem" >
+        select pi_groupid,pi_classid,pi_service,p_code from package_item order by pi_groupid asc,pi_classid  asc ,id asc
+
+    </select>
+
+
+</mapper>

src/main/resources/mybatis/mapper/global/PackagesMapper.xml

@@ -9,6 +9,15 @@
         <result column="p_name" property="p_name" jdbcType="VARCHAR" />
         <result column="p_days" property="p_days" jdbcType="INTEGER" />
         <result column="p_amount" property="p_amount" jdbcType="INTEGER" />
+        <result column="p_show" property="p_show" jdbcType="INTEGER" />
+        <result column="p_seq" property="p_seq" jdbcType="INTEGER" />
+        <result column="p_showname" property="p_showname" jdbcType="VARCHAR" />
+        <result column="p_listimg" property="p_listimg" jdbcType="VARCHAR" />
+        <result column="p_listdesc" property="p_listdesc" jdbcType="VARCHAR" />
+        <result column="p_detailimg" property="p_detailimg" jdbcType="VARCHAR" />
+        <result column="p_detaildesc" property="p_detaildesc" jdbcType="VARCHAR" />
+
+
     </resultMap>
 
     <!--获取所有数据-->
@@ -24,4 +33,23 @@
         from packages
     </select>
 
+    <select id="getPackageShowname" resultType="com.ygj.yuemum.domain.global.Packages" >
+        select p_code,p_showname from packages
+       where p_show = '1'
+        order by p_seq asc
+    </select>
+
+    <select id="getPackageLists" resultType="com.ygj.yuemum.domain.global.Packages" >
+        select p_code,p_name,p_days,p_amount,p_listimg,p_listdesc
+        from packages
+        where p_type = '1'
+        order by p_seq asc
+    </select>
+
+    <select id="getPackageDetail" resultType="com.ygj.yuemum.domain.global.Packages"  parameterType="java.lang.String" >
+        select p_name,p_days,p_amount,p_detailimg,p_detaildesc
+        from packages
+        where p_code = #{p_code,jdbcType=VARCHAR}
+    </select>
+
 </mapper>

src/main/resources/mybatis/mapper/wxmini/WXPromotionMapper.xml

@@ -14,11 +14,20 @@
 
     <!--获取所有数据-->
     <select id="getPromotions" resultType="com.ygj.yuemum.domain.wxmini.WXPromotion" >
-        select
-        id,wp_name,wp_desc,wp_url,wp_href,DATE_FORMAT(wp_startdate,'%Y/%m/%d') wp_startdate,DATE_FORMAT(wp_enddate,'%Y/%m/%d') wp_enddate
-        from wx_promotion
-        where  CURDATE()  BETWEEN wp_startdate and wp_enddate
-        order by id desc
+        SELECT
+        id,
+        wp_name,
+        wp_desc,
+        wp_url,
+        wp_href,
+        DATE_FORMAT(wp_startdate, '%Y/%m/%d') wp_startdate,
+        DATE_FORMAT(wp_enddate, '%Y/%m/%d') wp_enddate,
+        if(TO_DAYS(NOW()) - TO_DAYS(wp_enddate) &lt;= 0,'Y','N') wp_isexpire
+        FROM
+        wx_promotion
+
+        ORDER BY
+        id DESC
     </select>
 
 </mapper>

src/main/resources/mybatis/mapper/wxmini/WXYueSuoMapper.xml

@@ -0,0 +1,22 @@
+<?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.wxmini.WXYueSuoDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.wxmini.WXYueSuo" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="wy_type" property="wy_type" jdbcType="INTEGER" />
+        <result column="wy_position" property="wy_position" jdbcType="VARCHAR" />
+        <result column="wy_seq" property="wy_seq" jdbcType="INTEGER" />
+        <result column="wy_size" property="wy_size" jdbcType="VARCHAR" />
+        <result column="wy_url" property="wy_url" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getYueSuo" resultType="com.ygj.yuemum.domain.wxmini.WXYueSuo" >
+        select
+        id,wy_type,wy_position,wy_seq,wy_size,wy_url
+        from wx_yuesuo
+        order by wy_type asc ,wy_seq asc
+    </select>
+
+</mapper>