crud

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

@@ -1,15 +1,13 @@
 package com.ygj.yuemum;
 
-import com.ygj.yuemum.service.global.WeChatInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 public class ScheduledService {
-    @Autowired
-    private WeChatInfoService weChatInfoService;
+//    @Autowired
+//    private WeChatInfoService weChatInfoService;
 //    @Scheduled(fixedRate = 5400000)
 //    public void timerCron() {
-////        weChatInfoService.SaveWeChatInfo();
+//        weChatInfoService.SaveWeChatInfo();
 //    }
 }

src/main/java/com/ygj/yuemum/controller/admin/ImageUploadController.java

@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.ygj.yuemum.domain.admin.Photo;
 import com.ygj.yuemum.domain.admin.Resume;
 import com.ygj.yuemum.domain.maternitymatron.JlServiceUser;
+import com.ygj.yuemum.domain.pay.CustomerPayVoucher;
 import com.ygj.yuemum.service.admin.PhotoService;
 import com.ygj.yuemum.service.admin.ResumeService;
 import com.ygj.yuemum.service.maternitymatron.JlServiceUserService;
+import com.ygj.yuemum.service.pay.CustomerPayVoucherService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.ResourceUtils;
@@ -19,7 +21,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 
 
 @RestController
@@ -30,6 +31,8 @@ public class ImageUploadController {
     private JlServiceUserService jlServiceUserService;
     @Autowired
     private ResumeService resumeService;
+    @Autowired
+    private CustomerPayVoucherService customerPayVoucherService;
     private ResourceLoader resourceLoader;
 //    public static final String ROOT = "/usr/local/apache-tomcat-8.5.30/webapps/resume/img/";
 //    public static final String ResumeFile = "/usr/local/apache-tomcat-8.5.30/webapps/resume/";
@@ -37,18 +40,22 @@ public class ImageUploadController {
 //    public static final String httphtmlRoot = "http://192.168.1.24/resume/";
 //    public static final String modulePath = "/usr/local/apache-tomcat-8.5.30/webapps/resume/resume.html";
 
-
+//
 //    public static final String ROOT = "/usr/local/tomcat/tomcat7/webapps/resume/img/";
 //    public static final String ResumeFile = "/usr/local/tomcat/tomcat7/webapps/resume/";
 //    public static final String httpRoot = "http://yuesuo.yueguanjia.com/resume/img/";
 //    public static final String httphtmlRoot = "http://yuesuo.yueguanjia.com/resume/";
 //    public static final String modulePath = "/usr/local/tomcat/tomcat7/webapps/resume/resume.html";
+//    public static final String payvoucher = "/usr/local/tomcat/tomcat7/webapps/payvoucher";
+//    public static final String httppayvoucher = "http://yuesuo.yueguanjia.com/payvoucher";
 
     public static final String ROOT = "D:/apache-tomcat-9.0.6/webapps/resume/img/";
     public static final String ResumeFile = "D:/apache-tomcat-9.0.6/webapps/resume/";
     public static final String httpRoot = "http://localhost:8080/resume/img/";
     public static final String httphtmlRoot = "http://localhost:8080/resume/";
     public static final String modulePath = "D:/apache-tomcat-9.0.6/webapps/resume/resume.html";
+    public static final String payvoucher = "D:/apache-tomcat-9.0.6/webapps/payvoucher";
+    public static final String httppayvoucher = "http://localhost:8080/payvoucher";
 
     @RequestMapping(value = "/upload", method = RequestMethod.GET)
     public String upload() {
@@ -113,11 +120,13 @@ public class ImageUploadController {
         return jso;
     }
 
+
     @PostMapping("/createResume")
     public String createResume(@ModelAttribute Photo photo) {
-        String urlName = UUID.randomUUID().toString().replace("-", "");
+        String urlName = "";
         try {
             JlServiceUser jlServiceUser  = jlServiceUserService.getResume(photo.getServant_code());
+            urlName = String.valueOf(jlServiceUser.getId());
             File file = ResourceUtils.getFile(modulePath);
             BufferedReader br = new BufferedReader(new FileReader(file));
             Resume resume =new Resume();
@@ -337,7 +346,77 @@ public class ImageUploadController {
         return "error";
     }
     @GetMapping("/reBulidResume")
-    public int getCouponbatchs(@RequestParam("servant_code") String servant_code) {
+    public int reBulidResume(@RequestParam("servant_code") String servant_code) {
         return photoService.reBuildResume(servant_code);
     }
+
+    @RequestMapping(value = "/uploadPayImg", method = RequestMethod.POST)
+    @ResponseBody
+    public int uploadPayImg(@RequestParam("file") MultipartFile file,
+                            @RequestParam(value = "eh_code") String eh_code) {
+        int dot = file.getOriginalFilename().lastIndexOf('.');
+        String newName = file.getOriginalFilename().substring(dot);
+        CustomerPayVoucher customerPayVoucher  = new CustomerPayVoucher();
+        if (file.isEmpty()) {
+            return 0;
+        }
+        Date date = new Date();
+        DateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        File dest = new File(payvoucher + "/" + eh_code + sdf.format(date) +newName);
+        // 删除
+        try {
+            file.transferTo(dest); //保存文件
+            customerPayVoucher.setEh_code(eh_code);
+            customerPayVoucher.setCv_filename(eh_code + sdf.format(date) +newName);
+            customerPayVoucher.setCv_filepath(httppayvoucher + "/"+ eh_code + sdf.format(date) +newName);
+            customerPayVoucherService.insertCustomerPayVoucher(customerPayVoucher);
+            return 1;
+        } catch (IllegalStateException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return 0;
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return 0;
+        }
+    }
+    @GetMapping("/deletePayPhoto")
+    public int deletePayPhoto(@RequestParam("cv_filename") String cv_filename) throws ParseException {
+        try {
+            String path = payvoucher + "/"+ cv_filename;
+            File dest = new File(path);
+            dest.delete();
+            return customerPayVoucherService.deleteCustomerPayVoucher(cv_filename);
+        } catch (Exception ex){
+            ex.printStackTrace();
+            return 0;
+        }
+    }
+
+    @GetMapping("/deleteCustomerPayVoucherAll")
+    public int deleteCustomerPayVoucherAll(@RequestParam("eh_code") String eh_code) throws ParseException {
+        try {
+            List<CustomerPayVoucher> customerPays= customerPayVoucherService.selectCustomerPayVoucher(eh_code);
+            for(CustomerPayVoucher cpv:customerPays){
+                String path =  payvoucher + "/"+ cpv.getCv_filename();
+                File dest = new File(path);
+                dest.delete();
+            }
+            return customerPayVoucherService.deleteCustomerPayVoucherAll(eh_code);
+        } catch (Exception ex){
+            ex.printStackTrace();
+            return 0;
+        }
+    }
+
+    @GetMapping ("/queryPayPhoto")
+    public String queryPayPhoto(@RequestParam("eh_code") String eh_code) throws ParseException {
+        List<CustomerPayVoucher> customerPays= customerPayVoucherService.selectCustomerPayVoucher(eh_code);
+        String jso = JSONObject.toJSONString(customerPays);
+        jso = jso.replaceAll("cv_filepath","url");
+        jso = jso.replaceAll("cv_filename","name");
+        return jso;
+    }
+
 }

src/main/java/com/ygj/yuemum/controller/customer/CustomerBookingController.java

@@ -28,6 +28,11 @@ public class CustomerBookingController {
     @PostMapping("/insertCustomerBooking")
     public int insertCustomerPay(@ModelAttribute CustomerBooking customerBooking) {
         return  customerBookingService.insertCustomerBooking(customerBooking);
+        //send ms
+    }
+    @PostMapping("/insertEqCustomerBooking")
+    public int insertEqCustomerPay(@ModelAttribute CustomerBooking customerBooking) {
+        return  customerBookingService.insertEqCustomerBooking(customerBooking);
+        //send ms
     }
-
 }

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

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

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

@@ -66,5 +66,4 @@ public class EquipmenteHireHeadController {
         return equipmenteHireHeadService.equipmentSettle(equipmenteHireHead);
     }
 
-
 }

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

@@ -24,4 +24,9 @@ public class WeChatInfoController {
         return saveWeChatInfo.getWeChatInfo(url);
     }
 
+    @GetMapping("/getWXOpenid")
+    public Map<String,String> getWXOpenid(@RequestParam("js_code") String js_code) {
+        return saveWeChatInfo.getWXOpenid(js_code);
+    }
+
 }

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

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.controller.wxmini;
+
+
+import com.ygj.yuemum.domain.wxmini.WXBanner;
+import com.ygj.yuemum.service.wxmini.WXBannerService;
+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 WXBannerController {
+
+    @Autowired
+    private WXBannerService wxBannerService;
+    @GetMapping("/getBanners")
+    public List<WXBanner> getBanners() {
+        List<WXBanner> wxBanners = wxBannerService.getBanners();
+        return wxBanners;
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.ygj.yuemum.controller.wxmini;
+
+
+import com.ygj.yuemum.domain.wxmini.WXIndex;
+import com.ygj.yuemum.service.wxmini.WXIndexService;
+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 WXIndexController {
+
+    @Autowired
+    private WXIndexService wxIndexService;
+    @GetMapping("/getIndexs")
+    public List<WXIndex> getIndexs() {
+        List<WXIndex> wxIndices = wxIndexService.getIndexs();
+        return wxIndices;
+    }
+
+    @GetMapping("/getConsultant")
+    public WXIndex getConsultant() {
+        WXIndex wxIndex = wxIndexService.getConsultant();
+        return wxIndex;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.controller.wxmini;
+
+
+import com.ygj.yuemum.domain.wxmini.WXMktInfo;
+import com.ygj.yuemum.service.wxmini.WXMktInfoService;
+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 WXMktInfoController {
+
+    @Autowired
+    private WXMktInfoService mktInfoService;
+    @GetMapping("/getMktInfos")
+    public List<WXMktInfo> getMktInfos() {
+        List<WXMktInfo> mktInfos = mktInfoService.getMktInfos();
+        return mktInfos;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.controller.wxmini;
+
+
+import com.ygj.yuemum.domain.wxmini.WXPromotion;
+import com.ygj.yuemum.service.wxmini.WXPromotionService;
+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 WXPromotionController {
+
+    @Autowired
+    private WXPromotionService wxPromotionService;
+    @GetMapping("/getPromotions")
+    public List<WXPromotion> getPromotions() {
+        List<WXPromotion> wxPromotions = wxPromotionService.getPromotions();
+        return wxPromotions;
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.ygj.yuemum.controller.wxmini;
+
+
+import com.ygj.yuemum.domain.wxmini.WXUser;
+import com.ygj.yuemum.service.wxmini.WXUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class WXUserController {
+
+    @Autowired
+    private WXUserService wxUserService;
+    @GetMapping("/getWXUser")
+    public WXUser getWXUser(@RequestParam("xu_openid") String xu_openid) {
+        WXUser wxUser = wxUserService.getWXUser(xu_openid);
+        return wxUser;
+    }
+    @GetMapping("/getWXUserType")
+    public int getWXUserType(@RequestParam("xu_openid") String xu_openid) {
+        return wxUserService.getWXUserType(xu_openid);
+    }
+    @PostMapping("/insertWXUser")
+    public int insertWXUser(@ModelAttribute WXUser wxUser) {
+        return wxUserService.insertWXUser(wxUser);
+    }
+    @PostMapping("/updateWXUser")
+    public int updateWXUser(@ModelAttribute WXUser wxUser) {
+        return wxUserService.updateWXUser(wxUser);
+    }
+}

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

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

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

@@ -14,5 +14,6 @@ public interface EquipmenteHireHeadDao {
     int deleteByPrimaryKey(String eh_code);
     int insertSelective(EquipmenteHireHead record);
     int updateByPrimaryKeySelective(EquipmenteHireHead record);
+    int updateEqorderStatus(EquipmenteHireHead record);
     int getSeq();
 }

src/main/java/com/ygj/yuemum/dao/maternitymatron/JlServiceUserDao.java

@@ -30,37 +30,11 @@ public interface JlServiceUserDao {
     List<QueryServiceUserStock> queryEditServiceUser(QueryServiceUserStock record);
 
     int getcount();
-    int getstocklistcount();
-    int getStock(QueryServiceUserStock queryServiceUserStock);
-    int getquerycount(QueryServiceUser record);
     int getpmid();
     int upDateStatus(JlServiceUser record);
     int saltcheck(String salt);
-
-    /**
-     * 根据id删除某个库存信息
-     * @param id
-     * @return
-     */
     int deleteByPrimaryKey(Integer id);
-
-    /**
-     * 插入一条用库存息
-     * @param record
-     * @return
-     */
     int insertSelective(JlServiceUser record);
-    /**
-     * 根据id查找某个库存信息
-     * @param id
-     * @return User
-     */
     JlServiceUser selectByPrimaryKey(Integer id);
-
-    /**
-     * 根据id更新一条库存信息
-     * @param record
-     * @return
-     */
     int updateByPrimaryKeySelective(JlServiceUser record);
 }

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

@@ -0,0 +1,15 @@
+package com.ygj.yuemum.dao.pay;
+
+import com.ygj.yuemum.domain.pay.CustomerPayVoucher;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CustomerPayVoucherDao {
+
+    List<CustomerPayVoucher> selectCustomerPayVoucher(String cp_orderno);
+    int insertCustomerPayVoucher(CustomerPayVoucher customerPayVoucher);
+    int deleteCustomerPayVoucher(String cv_filename);
+    int deleteCustomerPayVoucherAll(String eh_code);
+}

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

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

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

@@ -0,0 +1,13 @@
+package com.ygj.yuemum.dao.wxmini;
+
+import com.ygj.yuemum.domain.wxmini.WXIndex;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface WXIndexDao {
+
+    List<WXIndex> getIndexs();
+    WXIndex getConsultant();
+}

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

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

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

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

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

@@ -0,0 +1,13 @@
+package com.ygj.yuemum.dao.wxmini;
+
+import com.ygj.yuemum.domain.wxmini.WXUser;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WXUserDao {
+
+    WXUser getWXUser(String xu_openid);
+    int insertWXUser(WXUser wxUser);
+    int updateWXUser(WXUser wxUser);
+    int getWXUserType(String xu_openid);
+}

src/main/java/com/ygj/yuemum/domain/customer/CustomerBooking.java

@@ -8,6 +8,15 @@ public class CustomerBooking {
     private String bk_date;
     private Integer bk_type;
     private String bk_desc;
+    private String eh_code;
+
+    public String getEh_code() {
+        return eh_code;
+    }
+
+    public void setEh_code(String eh_code) {
+        this.eh_code = eh_code;
+    }
 
     public Integer getId() {
         return id;

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

@@ -6,7 +6,42 @@ public class EquipmentType {
     private String et_name;
     private Integer et_mortagage;
     private Integer et_rent;
+    private String et_url;
+    private String et_listurl;
+    private String et_bannerurl;
+    private String et_desc;
 
+    public String getEt_desc() {
+        return et_desc;
+    }
+
+    public void setEt_desc(String et_desc) {
+        this.et_desc = et_desc;
+    }
+
+    public String getEt_bannerurl() {
+        return et_bannerurl;
+    }
+
+    public void setEt_bannerurl(String et_bannerurl) {
+        this.et_bannerurl = et_bannerurl;
+    }
+
+    public String getEt_listurl() {
+        return et_listurl;
+    }
+
+    public void setEt_listurl(String et_listurl) {
+        this.et_listurl = et_listurl;
+    }
+
+    public String getEt_url() {
+        return et_url;
+    }
+
+    public void setEt_url(String et_url) {
+        this.et_url = et_url;
+    }
 
     public Integer getEt_mortagage() {
         return et_mortagage;

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

@@ -6,12 +6,39 @@ public class EquipmenteHireDetail {
     private String eh_code;
     private String et_type;
     private String ed_emcode;
-    private Integer ei_rent;
+    private String ei_rent;
     private Integer ei_mortagage;
     private String ed_startdate;
     private String ed_enddate;
-    private String ed_rental;// ????
+    private String ed_days;
     private Integer  et_typeid;
+    private Integer eh_mortagage;
+    private String equipmenturl;
+    private String eh_status;
+
+    public String getEh_status() {
+        return eh_status;
+    }
+
+    public void setEh_status(String eh_status) {
+        this.eh_status = eh_status;
+    }
+
+    public String getEquipmenturl() {
+        return equipmenturl;
+    }
+
+    public void setEquipmenturl(String equipmenturl) {
+        this.equipmenturl = equipmenturl;
+    }
+
+    public Integer getEh_mortagage() {
+        return eh_mortagage;
+    }
+
+    public void setEh_mortagage(Integer eh_mortagage) {
+        this.eh_mortagage = eh_mortagage;
+    }
 
     public Integer getEt_typeid() {
         return et_typeid;
@@ -21,22 +48,22 @@ public class EquipmenteHireDetail {
         this.et_typeid = et_typeid;
     }
 
-    public String getEd_rental() {
-        return ed_rental;
+    public String getEd_days() {
+        return ed_days;
     }
 
-    public void setEd_rental(String ed_rental) {
-        this.ed_rental = ed_rental;
+    public void setEd_days(String ed_days) {
+        this.ed_days = ed_days;
     }
 
     private int limit;
     private int page;
 
-    public Integer getEi_rent() {
+    public String getEi_rent() {
         return ei_rent;
     }
 
-    public void setEi_rent(Integer ei_rent) {
+    public void setEi_rent(String ei_rent) {
         this.ei_rent = ei_rent;
     }
 

src/main/java/com/ygj/yuemum/domain/maternitymatron/QueryServiceUserStock.java

@@ -1,5 +1,7 @@
 package com.ygj.yuemum.domain.maternitymatron;
 
+import java.util.List;
+
 public class QueryServiceUserStock {
 
     private String id;
@@ -7,10 +9,12 @@ public class QueryServiceUserStock {
     private String status;
     private String cityname;
     private String np;
+    private String experiencestart;
+    private String experienceend;
     private String experience;
     private String gender;
-    private String constellation;
-    private String zodiac;
+    private List<String> constellation;
+    private List<String> zodiac;
     private String babynumber;
     private String service_start;
     private String service_end;
@@ -84,6 +88,14 @@ public class QueryServiceUserStock {
         this.highlight = highlight;
     }
 
+    public String getExperience() {
+        return experience;
+    }
+
+    public void setExperience(String experience) {
+        this.experience = experience;
+    }
+
     public String getWeight() {
         return weight;
     }
@@ -156,12 +168,20 @@ public class QueryServiceUserStock {
         this.np = np;
     }
 
-    public String getExperience() {
-        return experience;
+    public String getExperiencestart() {
+        return experiencestart;
     }
 
-    public void setExperience(String experience) {
-        this.experience = experience;
+    public void setExperiencestart(String experiencestart) {
+        this.experiencestart = experiencestart;
+    }
+
+    public String getExperienceend() {
+        return experienceend;
+    }
+
+    public void setExperienceend(String experienceend) {
+        this.experienceend = experienceend;
     }
 
     public String getGender() {
@@ -172,19 +192,19 @@ public class QueryServiceUserStock {
         this.gender = gender;
     }
 
-    public String getConstellation() {
+    public List<String> getConstellation() {
         return constellation;
     }
 
-    public void setConstellation(String constellation) {
+    public void setConstellation(List<String> constellation) {
         this.constellation = constellation;
     }
 
-    public String getZodiac() {
+    public List<String> getZodiac() {
         return zodiac;
     }
 
-    public void setZodiac(String zodiac) {
+    public void setZodiac(List<String> zodiac) {
         this.zodiac = zodiac;
     }
 

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

@@ -0,0 +1,41 @@
+package com.ygj.yuemum.domain.pay;
+
+public class CustomerPayVoucher {
+
+    private Integer id;
+    private String eh_code;
+    private String cv_filename;
+    private String cv_filepath;
+
+    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 String getCv_filename() {
+        return cv_filename;
+    }
+
+    public void setCv_filename(String cv_filename) {
+        this.cv_filename = cv_filename;
+    }
+
+    public String getCv_filepath() {
+        return cv_filepath;
+    }
+
+    public void setCv_filepath(String cv_filepath) {
+        this.cv_filepath = cv_filepath;
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.ygj.yuemum.domain.wxmini;
+
+public class WXBanner {
+    private Integer id;
+    private Integer wb_seq;
+    private String wb_url;
+    private String wb_href;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getWb_seq() {
+        return wb_seq;
+    }
+
+    public void setWb_seq(Integer wb_seq) {
+        this.wb_seq = wb_seq;
+    }
+
+    public String getWb_url() {
+        return wb_url;
+    }
+
+    public void setWb_url(String wb_url) {
+        this.wb_url = wb_url;
+    }
+
+    public String getWb_href() {
+        return wb_href;
+    }
+
+    public void setWb_href(String wb_href) {
+        this.wb_href = wb_href;
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.ygj.yuemum.domain.wxmini;
+
+public class WXIndex {
+    private Integer id;
+    private Integer wi_type;
+    private String wi_url;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getWi_type() {
+        return wi_type;
+    }
+
+    public void setWi_type(Integer wi_type) {
+        this.wi_type = wi_type;
+    }
+
+    public String getWi_url() {
+        return wi_url;
+    }
+
+    public void setWi_url(String wi_url) {
+        this.wi_url = wi_url;
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.ygj.yuemum.domain.wxmini;
+
+public class WXMktInfo {
+    private Integer id;
+    private String mi_mktname;
+    private String mi_mktaddress;
+    private String mi_latitude;
+    private String mi_longitude;
+    private String mi_mkturl;
+    private String mi_mapurl;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getMi_mktname() {
+        return mi_mktname;
+    }
+
+    public void setMi_mktname(String mi_mktname) {
+        this.mi_mktname = mi_mktname;
+    }
+
+    public String getMi_mktaddress() {
+        return mi_mktaddress;
+    }
+
+    public void setMi_mktaddress(String mi_mktaddress) {
+        this.mi_mktaddress = mi_mktaddress;
+    }
+
+    public String getMi_latitude() {
+        return mi_latitude;
+    }
+
+    public void setMi_latitude(String mi_latitude) {
+        this.mi_latitude = mi_latitude;
+    }
+
+    public String getMi_longitude() {
+        return mi_longitude;
+    }
+
+    public void setMi_longitude(String mi_longitude) {
+        this.mi_longitude = mi_longitude;
+    }
+
+    public String getMi_mkturl() {
+        return mi_mkturl;
+    }
+
+    public void setMi_mkturl(String mi_mkturl) {
+        this.mi_mkturl = mi_mkturl;
+    }
+
+    public String getMi_mapurl() {
+        return mi_mapurl;
+    }
+
+    public void setMi_mapurl(String mi_mapurl) {
+        this.mi_mapurl = mi_mapurl;
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.ygj.yuemum.domain.wxmini;
+
+public class WXPromotion {
+    private Integer id;
+    private String wp_name;
+    private String wp_desc;
+    private String wp_url;
+    private String wp_href;
+    private String wp_startdate;
+    private String wp_enddate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getWp_name() {
+        return wp_name;
+    }
+
+    public void setWp_name(String wp_name) {
+        this.wp_name = wp_name;
+    }
+
+    public String getWp_desc() {
+        return wp_desc;
+    }
+
+    public void setWp_desc(String wp_desc) {
+        this.wp_desc = wp_desc;
+    }
+
+    public String getWp_url() {
+        return wp_url;
+    }
+
+    public void setWp_url(String wp_url) {
+        this.wp_url = wp_url;
+    }
+
+    public String getWp_href() {
+        return wp_href;
+    }
+
+    public void setWp_href(String wp_href) {
+        this.wp_href = wp_href;
+    }
+
+    public String getWp_startdate() {
+        return wp_startdate;
+    }
+
+    public void setWp_startdate(String wp_startdate) {
+        this.wp_startdate = wp_startdate;
+    }
+
+    public String getWp_enddate() {
+        return wp_enddate;
+    }
+
+    public void setWp_enddate(String wp_enddate) {
+        this.wp_enddate = wp_enddate;
+    }
+}

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

@@ -0,0 +1,121 @@
+package com.ygj.yuemum.domain.wxmini;
+
+public class WXUser {
+    private Integer id;
+    private String xu_openid;
+    private String xu_sessionkey;
+    private String xu_phone;
+    private String xu_name;
+    private String xu_avatarUrl;
+    private String xu_gender;
+    private String xu_city;
+    private String xu_province;
+    private String xu_country;
+    private String xu_language;
+    private String xu_ydate;
+    private Integer xu_isauthorize;
+
+    public Integer getXu_isauthorize() {
+        return xu_isauthorize;
+    }
+
+    public void setXu_isauthorize(Integer xu_isauthorize) {
+        this.xu_isauthorize = xu_isauthorize;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getXu_openid() {
+        return xu_openid;
+    }
+
+    public void setXu_openid(String xu_openid) {
+        this.xu_openid = xu_openid;
+    }
+
+    public String getXu_sessionkey() {
+        return xu_sessionkey;
+    }
+
+    public void setXu_sessionkey(String xu_sessionkey) {
+        this.xu_sessionkey = xu_sessionkey;
+    }
+
+    public String getXu_phone() {
+        return xu_phone;
+    }
+
+    public void setXu_phone(String xu_phone) {
+        this.xu_phone = xu_phone;
+    }
+
+    public String getXu_name() {
+        return xu_name;
+    }
+
+    public void setXu_name(String xu_name) {
+        this.xu_name = xu_name;
+    }
+
+    public String getXu_avatarUrl() {
+        return xu_avatarUrl;
+    }
+
+    public void setXu_avatarUrl(String xu_avatarUrl) {
+        this.xu_avatarUrl = xu_avatarUrl;
+    }
+
+    public String getXu_gender() {
+        return xu_gender;
+    }
+
+    public void setXu_gender(String xu_gender) {
+        this.xu_gender = xu_gender;
+    }
+
+    public String getXu_city() {
+        return xu_city;
+    }
+
+    public void setXu_city(String xu_city) {
+        this.xu_city = xu_city;
+    }
+
+    public String getXu_province() {
+        return xu_province;
+    }
+
+    public void setXu_province(String xu_province) {
+        this.xu_province = xu_province;
+    }
+
+    public String getXu_country() {
+        return xu_country;
+    }
+
+    public void setXu_country(String xu_country) {
+        this.xu_country = xu_country;
+    }
+
+    public String getXu_language() {
+        return xu_language;
+    }
+
+    public void setXu_language(String xu_language) {
+        this.xu_language = xu_language;
+    }
+
+    public String getXu_ydate() {
+        return xu_ydate;
+    }
+
+    public void setXu_ydate(String xu_ydate) {
+        this.xu_ydate = xu_ydate;
+    }
+}

src/main/java/com/ygj/yuemum/service/admin/PhotoService.java

@@ -71,7 +71,7 @@ public class PhotoService {
                         Map<String, String> params = new LinkedHashMap<>();
                         params.put("servant_code", String.valueOf(res.getServant_code()));
                         params.put("comment", res.getResume_comment());
-                        String tt = sendPostDataByMap("http://127.0.0.1:8888/createResume", params, "utf-8");
+                        String tt = sendPostDataByMap("http://yuesuo.yueguanjia.com:8888/createResume", params, "utf-8");
                     }
                 } else {
                     Resume resume = resumeService.getResume(Integer.parseInt(servant_code));
@@ -81,7 +81,7 @@ public class PhotoService {
                     Map<String, String> params = new LinkedHashMap<>();
                     params.put("servant_code", String.valueOf(resume.getServant_code()));
                     params.put("comment", resume.getResume_comment());
-                    String tt = sendPostDataByMap("http://127.0.0.1:8888/createResume", params, "utf-8");
+                    String tt = sendPostDataByMap("http://yuesuo.yueguanjia.com:8888/createResume", params, "utf-8");
                 }
             }
         } catch (Exception ex) {

src/main/java/com/ygj/yuemum/service/coupon/CouponService.java

@@ -28,7 +28,7 @@ public class CouponService {
     private CustomerCouponService customerCouponService;
     @Autowired
     private CouponLogService couponLogService;
-
+      //test
     String couponNewUserCoupon = "PVP2018051297451";
     String couponConsultTaskCoupon = "PVP2018051273883";
     String couponDetectionTaskCoupon = "PVP2018051211608";

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

@@ -2,6 +2,8 @@ package com.ygj.yuemum.service.customer;
 
 import com.ygj.yuemum.dao.customer.CustomerBookingDao;
 import com.ygj.yuemum.domain.customer.CustomerBooking;
+import com.ygj.yuemum.domain.equipment.EquipmenteHireHead;
+import com.ygj.yuemum.service.equipment.EquipmenteHireHeadService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -12,6 +14,8 @@ public class CustomerBookingService {
 
     @Autowired
     private CustomerBookingDao customerBookingDao;
+    @Autowired
+    private EquipmenteHireHeadService equipmenteHireHeadService;
 
 
     public List<CustomerBooking> selectAll() {
@@ -25,4 +29,17 @@ public class CustomerBookingService {
     public int insertCustomerBooking(CustomerBooking customerBooking){
         return customerBookingDao.insertCustomerBooking(customerBooking);
     }
+    public int insertEqCustomerBooking(CustomerBooking customerBooking){
+        try{
+            customerBookingDao.insertCustomerBooking(customerBooking);
+            EquipmenteHireHead equipmenteHireHead = new EquipmenteHireHead();
+            equipmenteHireHead.setEh_code(customerBooking.getEh_code());
+            equipmenteHireHead.setEh_status(9);
+            equipmenteHireHeadService.updateEqorderStatus(equipmenteHireHead);
+        }catch (Exception ex){
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
+    }
 }

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

@@ -32,6 +32,8 @@ public class EquipmentReturnService {
     private ModooApiService modooApiService;
     @Autowired
     private ModooEquipmentLogService modooEquipmentLogService;
+    @Autowired
+    private EquipmenteHireDetailService equipmenteHireDetailService;
 
 
     public List<EquipmentReturn> selectEquipmentReturn(String cp_orderno) {
@@ -42,6 +44,7 @@ public class EquipmentReturnService {
         try {
             //save
             SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat sdfdate2 = new SimpleDateFormat("yyyy-MM-dd");
             List<EquipmentReturn> checks = equipmentReturnDao.selectEquipmentReturn(equipmentReturn.getEh_code());
             if(checks.size() != 0){
                 return 2;
@@ -80,6 +83,9 @@ public class EquipmentReturnService {
                 modooEquipmentLog.setMl_date(sdfdate.format(new Date()));
                 modooEquipmentLog.setMl_username(equipmentReturn.getEr_usercode());
                 modooEquipmentLogService.insertModooEquipmentLog(modooEquipmentLog);
+                //detail add enddate
+                ed.setEd_enddate(sdfdate2.format(new Date()));
+                equipmenteHireDetailService.updateEquipmenteHireDetail(ed);
             }
         } catch (Exception ex) {
             ex.printStackTrace();

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

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

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

@@ -15,10 +15,7 @@ import org.springframework.stereotype.Service;
 
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class EquipmenteHireHeadService {
@@ -72,8 +69,7 @@ public class EquipmenteHireHeadService {
             equipmenteHireHead.setEh_code(orderno);
             equipmenteHireHead.setEh_status(1);
             equipmenteHireHead.setEh_source(2);
-            Date date = sdfdate.parse(equipmenteHireHead.getEh_date());
-            equipmenteHireHead.setEh_date(sdfdate.format(date));
+            equipmenteHireHead.setEh_date(sdfdate.format(new Date()));
             equipmenteHireHeadDao.insertSelective(equipmenteHireHead);
             //add Detail
             List<EquipmenteHireDetail> equipmenteHireDetails = JSON.parseArray(equipmenteHireHead.getEh_detail(), EquipmenteHireDetail.class);
@@ -84,10 +80,6 @@ public class EquipmenteHireHeadService {
                     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);
                 }
             }
@@ -132,11 +124,7 @@ public class EquipmenteHireHeadService {
             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) {
@@ -149,6 +137,7 @@ public class EquipmenteHireHeadService {
     public int equipmentActive(EquipmenteHireHead equipmenteHireHead) {
         try {
             SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             equipmenteHireHead.setEh_status(3);
             equipmenteHireHeadDao.updateByPrimaryKeySelective(equipmenteHireHead);
             List<EquipmenteHireDetail> equipmenteHireDetails = equipmenteHireDetailService.selectByPrimaryKey(equipmenteHireHead.getEh_code());
@@ -170,6 +159,12 @@ public class EquipmenteHireHeadService {
                 modooEquipmentLog.setMl_date(sdfdate.format(new Date()));
                 modooEquipmentLog.setMl_username(equipmenteHireHead.getEh_usercode());
                 modooEquipmentLogService.insertModooEquipmentLog(modooEquipmentLog);
+                // add startdate
+                Calendar c=Calendar.getInstance();
+                c.add(Calendar.DATE, 4);
+                ed.setEd_startdate(sdf.format(c.getTime()));
+                equipmenteHireDetailService.updateEquipmenteHireDetail(ed);
+
             }
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -187,6 +182,9 @@ public class EquipmenteHireHeadService {
 
         return 1;
     }
+    public int updateEqorderStatus (EquipmenteHireHead equipmenteHireHead) {
+        return equipmenteHireHeadDao.updateEqorderStatus(equipmenteHireHead);
+    }
 
     public int addEquipmenteHireHeadOnline(EquipmenteHireHead equipmenteHireHead) {
         try {

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

@@ -3,6 +3,8 @@ package com.ygj.yuemum.service.global;
 import com.alibaba.fastjson.JSON;
 import com.ygj.yuemum.dao.global.WeChatInfoDao;
 import com.ygj.yuemum.domain.global.WeChatInfo;
+import com.ygj.yuemum.domain.wxmini.WXUser;
+import com.ygj.yuemum.service.wxmini.WXUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,19 +21,26 @@ import java.util.*;
 public class WeChatInfoService {
     @Autowired
     private WeChatInfoDao weChatInfoDao;
+    @Autowired
+    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 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";
     public static String JSAPI_TICKET_URL = "https://api.weixin.qq.com/cgi-bin/ticket/getticket";
-    private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5','6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+    public static String JSCODE2SESSION = "https://api.weixin.qq.com/sns/jscode2session";
+    private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
     String access_Token;
     String expires_in;
     String jsapi_Ticket;
     String noncestr;
     String timeStamp;
     String signaTure;
+    String session_key;
+    String openid;
 
     public int SaveWeChatInfo() {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -51,33 +60,65 @@ public class WeChatInfoService {
             weChatInfo.setJsapi_ticket(jsapi_Ticket);
             weChatInfo.setUpdate_time(dateFormat.format(new Date()));
             weChatInfoDao.updateWeChatInfo(weChatInfo);
-        }catch (Exception ex){
+        } catch (Exception ex) {
             ex.printStackTrace();
             return 0;
         }
         return 1;
     }
-    public Map<String,String> getWeChatInfo(String url){
-        WeChatInfo weChatInfo  = weChatInfoDao.getWeChatInfo();
+
+    public Map<String, String> getWXOpenid(String js_code) {
+        Map<String, String> result = new HashMap<>();
+        String resultToken = sendGet(JSCODE2SESSION + "?grant_type=authorization_code" + "&appid=" + MINIAPPID + "&secret=" + MINIAPPSECRET + "&js_code=" + js_code);
+        Map mapToken = JSON.parseObject(resultToken);
+        session_key = String.valueOf(mapToken.get("session_key"));
+        openid = String.valueOf(mapToken.get("openid"));
+        //save database
+        //检查用户是否已经注册，注册返回手机号等信息，没注册返回openid作为用户名
+        //新用户 insert ，没有手机返回openid 有手机返回手机号等信息
+        WXUser ckeckwxUser = wxUserService.getWXUser(openid);
+        if(ckeckwxUser != null) {
+            result.put("openid", openid);
+            result.put("type","2");
+            result.put("nickName",ckeckwxUser.getXu_name());
+        } else {
+            WXUser wxUser = new WXUser();
+            wxUser.setXu_openid(openid);
+            wxUser.setXu_sessionkey(session_key);
+            UUID id=UUID.randomUUID();
+            String[] idd=id.toString().split("-");
+            String lsid = "YSLS"+idd[1];
+            wxUser.setXu_name(lsid);
+            wxUserService.insertWXUser(wxUser);
+            result.put("openid", openid);
+            result.put("type","1");
+            result.put("nickName",lsid);
+        }
+        result.put("session_key", session_key);
+        return result;
+    }
+
+    public Map<String, String> getWeChatInfo(String url) {
+        WeChatInfo weChatInfo = weChatInfoDao.getWeChatInfo();
         Map<String, String> result = new HashMap<>();
         String timestamp = getTimestamp();
         String noncestr = getNoncestr();
-        String signature =SHA1(jointString(weChatInfo.getJsapi_ticket(),noncestr,timestamp,url));
-        result.put("timestamp",timestamp);
-        result.put("nonceStr",noncestr);
-        result.put("signature",signature);
-        result.put("appid",APPID);
-        result.put("jsapi_ticket",weChatInfo.getJsapi_ticket());
+        String signature = SHA1(jointString(weChatInfo.getJsapi_ticket(), noncestr, timestamp, url));
+        result.put("timestamp", timestamp);
+        result.put("nonceStr", noncestr);
+        result.put("signature", signature);
+        result.put("appid", APPID);
+        result.put("jsapi_ticket", weChatInfo.getJsapi_ticket());
         return result;
     }
 
     //-----------------------------------
-    public static String jointString(String jsapi_Ticket,String noncestr,String timestamp,String url){
-        String sb = new String ();
-        sb +="jsapi_ticket=" + jsapi_Ticket+"&";
-        sb +="noncestr=" + noncestr+"&";
-        sb +="timestamp=" + timestamp+"&";
-        sb +="url=" + url;
+    public static String jointString(String jsapi_Ticket, String noncestr, String timestamp, String url) {
+        String sb = new String();
+        sb += "jsapi_ticket=" + jsapi_Ticket + "&";
+        sb += "noncestr=" + noncestr + "&";
+        sb += "timestamp=" + timestamp + "&";
+        sb += "url=" + url;
         return sb;
     }
 
@@ -105,10 +146,11 @@ public class WeChatInfoService {
         return null;
     }
 
-    public static String getTimestamp(){
-        return Long.toString(System.currentTimeMillis()/1000);
+    public static String getTimestamp() {
+        return Long.toString(System.currentTimeMillis() / 1000);
     }
-    public static String getNoncestr(){
+
+    public static String getNoncestr() {
         return UUID.randomUUID().toString();
     }
 

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

@@ -0,0 +1,31 @@
+package com.ygj.yuemum.service.pay;
+
+import com.ygj.yuemum.dao.pay.CustomerPayVoucherDao;
+import com.ygj.yuemum.domain.pay.CustomerPayVoucher;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class CustomerPayVoucherService {
+
+    @Autowired
+    private CustomerPayVoucherDao customerPayVoucherDao;
+
+
+    public List<CustomerPayVoucher> selectCustomerPayVoucher(String eh_code) {
+        return customerPayVoucherDao.selectCustomerPayVoucher(eh_code);
+    }
+    public int insertCustomerPayVoucher(CustomerPayVoucher customerPayVoucher) {
+        return customerPayVoucherDao.insertCustomerPayVoucher(customerPayVoucher);
+    }
+    public int deleteCustomerPayVoucher(String cv_filename){
+        return  customerPayVoucherDao.deleteCustomerPayVoucher(cv_filename);
+    }
+    public int deleteCustomerPayVoucherAll(String eh_code){
+        return  customerPayVoucherDao.deleteCustomerPayVoucherAll(eh_code);
+    }
+
+
+}

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

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.service.wxmini;
+
+import com.ygj.yuemum.dao.wxmini.WXBannerDao;
+import com.ygj.yuemum.domain.wxmini.WXBanner;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class WXBannerService {
+
+    @Autowired
+
+    private WXBannerDao wxBannerDao;
+
+    public List<WXBanner> getBanners() {
+        return wxBannerDao.getBanners();
+    }
+
+
+}

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

@@ -0,0 +1,24 @@
+package com.ygj.yuemum.service.wxmini;
+
+import com.ygj.yuemum.dao.wxmini.WXIndexDao;
+import com.ygj.yuemum.domain.wxmini.WXIndex;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class WXIndexService {
+
+    @Autowired
+
+    private WXIndexDao wxIndexDao;
+
+    public List<WXIndex> getIndexs() {
+        return wxIndexDao.getIndexs();
+    }
+
+    public WXIndex getConsultant() {
+        return wxIndexDao.getConsultant();
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.service.wxmini;
+
+import com.ygj.yuemum.dao.wxmini.WXMktInfoDao;
+import com.ygj.yuemum.domain.wxmini.WXMktInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class WXMktInfoService {
+
+    @Autowired
+
+    private WXMktInfoDao mktInfoDao;
+
+    public List<WXMktInfo> getMktInfos() {
+        return mktInfoDao.getMktInfos();
+    }
+
+
+}

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

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.service.wxmini;
+
+import com.ygj.yuemum.dao.wxmini.WXPromotionDao;
+import com.ygj.yuemum.domain.wxmini.WXPromotion;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class WXPromotionService {
+
+    @Autowired
+
+    private WXPromotionDao wxPromotionSDao;
+
+    public List<WXPromotion> getPromotions() {
+        return wxPromotionSDao.getPromotions();
+    }
+
+
+}

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

@@ -0,0 +1,28 @@
+package com.ygj.yuemum.service.wxmini;
+
+import com.ygj.yuemum.dao.wxmini.WXUserDao;
+import com.ygj.yuemum.domain.wxmini.WXUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class WXUserService {
+
+    @Autowired
+
+    private WXUserDao wxUserDao;
+
+    public WXUser getWXUser(String xu_openid) {
+        return wxUserDao.getWXUser(xu_openid);
+    }
+    public int insertWXUser(WXUser wxUser){
+        return wxUserDao.insertWXUser(wxUser);
+    }
+    public int updateWXUser(WXUser wxUser){
+        return wxUserDao.updateWXUser(wxUser);
+    }
+    public int getWXUserType(String xu_openid) {
+        return wxUserDao.getWXUserType(xu_openid);
+    }
+
+}

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/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
+  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/mapper/wxmini/*.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,com.ygj.yuemum.domain/wxmini
   log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 spring:
   datasource:

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

@@ -7,19 +7,23 @@
         <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_url" property="et_url" jdbcType="VARCHAR" />
+        <result column="et_listurl" property="et_listurl" jdbcType="VARCHAR" />
+        <result column="et_bannerurl" property="et_bannerurl" jdbcType="VARCHAR" />
+        <result column="et_desc" property="et_desc" jdbcType="VARCHAR" />
         <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,et_rent,et_mortagage
+        id,et_code,et_name,et_rent,et_mortagage,et_listurl,et_url,et_bannerurl,et_desc
         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
+        id,et_code,et_name,et_rent,et_mortagage,et_listurl,et_url,et_bannerurl,et_desc
         from equipment_type
         where et_code = #{et_code,jdbcType=INTEGER}
     </select>

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

@@ -7,18 +7,18 @@
         <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_days" property="ed_days" 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
+        id,eh_code,et_type,ed_emcode,ed_days,ed_startdate,ed_enddate
     </sql>
 
     <select id="getAll" resultMap="BaseResultMap" >
         select
-        id,eh_code,et_type,ed_emcode,ed_rental,ed_startdate,ed_enddate
+        id,eh_code,et_type,ed_emcode,ed_days,ed_startdate,ed_enddate
         from equipment_hire_detail
         order by id desc
     </select>
@@ -33,7 +33,7 @@
         fgetequipmentmortagage(et_type) ei_mortagage,
         fgetequipmentrent(et_type)  ei_rent,
         ed_startdate,
-        ed_enddate
+        ed_days
         from equipment_hire_detail
         where 1=1
         <if test="eh_code != null and eh_code != ''">
@@ -49,6 +49,22 @@
         where eh_code = #{eh_code,jdbcType=VARCHAR}
     </select>
 
+    <select id="getCustomerEq" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select tb.eh_code,
+            fgetequipmenttypename(tb.et_type) et_type,
+            tb.ed_emcode,
+            tb.ed_startdate,
+            fgetequipmentrent(et_type)  ei_rent,
+            tb.ed_enddate,
+            ta.eh_mortagage,
+            fgetequipmenturl(tb.et_type) equipmenturl,
+            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}
+        order by  FIELD(ta.eh_status , 2,9,4) , ta.id desc
+    </select>
+
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
         delete from equipment_hire_detail
@@ -68,8 +84,8 @@
             <if test="ed_emcode != null" >
                 ed_emcode,
             </if>
-            <if test="ed_rental != null" >
-                ed_rental,
+            <if test="ed_days != null" >
+                ed_days,
             </if>
             <if test="ed_startdate != null" >
                 ed_startdate,
@@ -88,8 +104,8 @@
             <if test="ed_emcode != null" >
                 #{ed_emcode,jdbcType=VARCHAR},
             </if>
-            <if test="ed_rental != null" >
-                #{ed_rental,jdbcType=INTEGER},
+            <if test="ed_days != null" >
+                #{ed_days,jdbcType=INTEGER},
             </if>
             <if test="ed_startdate != null" >
                 #{ed_startdate,jdbcType=DATE},
@@ -104,15 +120,6 @@
     <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>
@@ -120,6 +127,7 @@
                 ed_enddate = #{ed_enddate,jdbcType=DATE}
             </if>
         </set>
-        where eh_code = #{eh_code,jdbcType=INTEGER}
+        where eh_code = #{eh_code,jdbcType=VARCHAR}
+        and ed_emcode = #{ed_emcode,jdbcType=VARCHAR}
     </update>
 </mapper>

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

@@ -240,7 +240,17 @@
                 eh_status = #{eh_status,jdbcType=DATE},
             </if>
             <if test="eh_source != null" >
-                eh_status = #{eh_source,jdbcType=DATE}
+                eh_source = #{eh_source,jdbcType=DATE}
+            </if>
+        </set>
+        where eh_code = #{eh_code,jdbcType=INTEGER}
+    </update>
+
+    <update id="updateEqorderStatus" parameterType="com.ygj.yuemum.domain.equipment.EquipmenteHireHead" >
+        update equipment_hire_head
+        <set >
+            <if test="eh_status != null" >
+                eh_status = #{eh_status,jdbcType=DATE}
             </if>
         </set>
         where eh_code = #{eh_code,jdbcType=INTEGER}

src/main/resources/mybatis/mapper/maternitymatron/JlServiceUserMapper.xml

@@ -355,16 +355,23 @@
             and jl_service_user.truename like "%"#{truename,jdbcType=VARCHAR}"%"
         </if>
         <if test="constellation != null ">
-            and constellation like  "%"#{constellation,jdbcType=VARCHAR}"%"
+            and constellation in
+            <foreach collection="constellation" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
         <if test="zodiac != null ">
-            and zodiac =  #{zodiac,jdbcType=VARCHAR}
+            and zodiac
+            IN <foreach collection="zodiac" item="item" index="index" open="(" separator="," close=")">
+                  #{item}
+              </foreach>
         </if>
         <if test="np != null ">
             and city = #{np,jdbcType=VARCHAR}
         </if>
-        <if test="experience != null and experience != 0">
-            and seniority = #{experience,jdbcType=VARCHAR}
+        <if test="experiencestart != null and experienceend != null">
+            and CAST( seniority AS SIGNED) &gt;= CAST( #{experiencestart,jdbcType=VARCHAR} AS SIGNED )
+            and CAST( seniority AS SIGNED) &lt;= CAST( #{experienceend,jdbcType=VARCHAR} AS SIGNED )
         </if>
         <if test="gender != null ">
             and gender = #{gender,jdbcType=VARCHAR}
@@ -372,9 +379,6 @@
         <if test="status != null ">
             and status = #{status,jdbcType=VARCHAR}
         </if>
-        <if test="gender != null ">
-            and gender = #{gender,jdbcType=VARCHAR}
-        </if>
         <if test="babynumber != null ">
             and babynumber = #{babynumber,jdbcType=VARCHAR}
         </if>

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

@@ -0,0 +1,58 @@
+<?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.CustomerPayVoucherDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.pay.CustomerPayVoucher" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="eh_code" property="eh_code" jdbcType="VARCHAR" />
+        <result column="cv_filename" property="cv_filename" jdbcType="VARCHAR" />
+        <result column="cv_filepath" property="cv_filepath" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <sql id="Base_Column_List" >
+        id, eh_code,cv_filename,cv_filepath
+    </sql>
+    <!-- 此处添加查询信息-->
+    <select id="selectCustomerPayVoucher" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        id, eh_code,cv_filename,cv_filepath
+        from customer_pay_voucher
+        where eh_code = #{eh_code,jdbcType=VARCHAR}
+        order by id desc
+    </select>
+
+    <!-- 插入一条培训信息 -->
+    <insert id="insertCustomerPayVoucher" parameterType="com.ygj.yuemum.domain.pay.CustomerPayVoucher" >
+        insert into customer_pay_voucher
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="eh_code != null" >
+                eh_code,
+            </if>
+            <if test="cv_filename != null" >
+                cv_filename,
+            </if>
+            <if test="cv_filepath != null" >
+                cv_filepath
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="eh_code != null" >
+                #{eh_code,jdbcType=VARCHAR},
+            </if>
+            <if test="cv_filename != null" >
+                #{cv_filename,jdbcType=VARCHAR},
+            </if>
+            <if test="cv_filepath != null" >
+                #{cv_filepath,jdbcType=VARCHAR}
+            </if>
+        </trim>
+    </insert>
+    <delete id="deleteCustomerPayVoucher" parameterType="java.lang.String"  >
+        delete from customer_pay_voucher
+        where cv_filename = #{cv_filename,jdbcType=VARCHAR}
+    </delete>
+    <delete id="deleteCustomerPayVoucherAll" parameterType="java.lang.String"  >
+        delete from customer_pay_voucher
+        where eh_code = #{eh_code,jdbcType=VARCHAR}
+    </delete>
+</mapper>

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

@@ -0,0 +1,21 @@
+<?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.WXBannerDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.wxmini.WXBanner" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="wb_seq" property="wb_seq" jdbcType="INTEGER" />
+        <result column="wb_url" property="wb_url" jdbcType="VARCHAR" />
+        <result column="wb_href" property="wb_href" jdbcType="VARCHAR" />
+
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getBanners" resultType="com.ygj.yuemum.domain.wxmini.WXBanner" >
+        select
+        id,wb_seq,wb_url,wb_href
+        from wx_banner
+        order by wb_seq asc
+    </select>
+
+</mapper>

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

@@ -0,0 +1,27 @@
+<?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.WXIndexDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.wxmini.WXIndex" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="wi_type" property="wi_type" jdbcType="INTEGER" />
+        <result column="wi_url" property="wi_url" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getIndexs" resultType="com.ygj.yuemum.domain.wxmini.WXIndex" >
+        select
+        id,wi_type,wi_url
+        from wx_index
+        order by id asc
+    </select>
+
+    <select id="getConsultant" resultType="com.ygj.yuemum.domain.wxmini.WXIndex" >
+        select
+        id,wi_type,wi_url
+        from wx_index
+        where wi_type = 3
+        order by id asc
+    </select>
+
+</mapper>

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

@@ -0,0 +1,23 @@
+<?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.WXMktInfoDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.wxmini.WXMktInfo" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="mi_mktname" property="mi_mktname" jdbcType="VARCHAR" />
+        <result column="mi_mktaddress" property="mi_mktaddress" jdbcType="VARCHAR" />
+        <result column="mi_latitude" property="mi_latitude" jdbcType="VARCHAR" />
+        <result column="mi_longitude" property="mi_longitude" jdbcType="VARCHAR" />
+        <result column="mi_mkturl" property="mi_mkturl" jdbcType="VARCHAR" />
+        <result column="mi_mapurl" property="mi_mapurl" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getMktInfos" resultType="com.ygj.yuemum.domain.wxmini.WXMktInfo" >
+        select
+        id,mi_mktname,mi_mktaddress,mi_latitude,mi_longitude,mi_mkturl,mi_mapurl
+        from wx_mkt_info
+        order by id asc
+    </select>
+
+</mapper>

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

@@ -0,0 +1,24 @@
+<?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.WXPromotionDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.wxmini.WXPromotion" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="wp_name" property="wp_name" jdbcType="VARCHAR" />
+        <result column="wp_desc" property="wp_desc" jdbcType="VARCHAR" />
+        <result column="wp_url" property="wp_url" jdbcType="VARCHAR" />
+        <result column="wp_href" property="wp_href" jdbcType="VARCHAR" />
+        <result column="wp_startdate" property="wp_startdate" jdbcType="DATE" />
+        <result column="wp_enddate" property="wp_enddate" jdbcType="DATE" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <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>
+
+</mapper>

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

@@ -0,0 +1,160 @@
+<?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.WXUserDao">
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.wxmini.WXUser">
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="xu_openid" property="xu_openid" jdbcType="VARCHAR"/>
+        <result column="xu_sessionkey" property="xu_sessionkey" jdbcType="VARCHAR"/>
+        <result column="xu_phone" property="xu_phone" jdbcType="VARCHAR"/>
+        <result column="xu_name" property="xu_name" jdbcType="VARCHAR"/>
+        <result column="xu_avatarUrl" property="xu_avatarUrl" jdbcType="VARCHAR"/>
+        <result column="xu_gender" property="xu_gender" jdbcType="VARCHAR"/>
+        <result column="xu_city" property="xu_city" jdbcType="VARCHAR"/>
+        <result column="xu_province" property="xu_province" jdbcType="VARCHAR"/>
+        <result column="xu_country" property="xu_country" jdbcType="VARCHAR"/>
+        <result column="xu_language" property="xu_language" jdbcType="VARCHAR"/>
+        <result column="xu_ydate" property="xu_ydate" jdbcType="DATE"/>
+        <result column="xu_isauthorize" property="xu_isauthorize" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getWXUser" resultType="com.ygj.yuemum.domain.wxmini.WXUser" parameterType="java.lang.String">
+        select
+        id,xu_openid,xu_sessionkey,xu_phone,xu_name,xu_avatarUrl,xu_gender,xu_city,xu_province,xu_country,xu_language,xu_ydate,xu_isauthorize
+        from wx_user
+        where xu_openid = #{xu_openid,jdbcType=VARCHAR}
+        order by id asc
+    </select>
+
+    <insert id="insertWXUser" parameterType="com.ygj.yuemum.domain.wxmini.WXUser" >
+        insert into wx_user
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="xu_openid != null" >
+                xu_openid,
+            </if>
+            <if test="xu_sessionkey != null" >
+                xu_sessionkey,
+            </if>
+            <if test="xu_phone != null" >
+                xu_phone,
+            </if>
+            <if test="xu_name != null" >
+                xu_name,
+            </if>
+            <if test="xu_avatarUrl != null" >
+                xu_avatarUrl,
+            </if>
+            <if test="xu_gender != null" >
+                xu_gender,
+            </if>
+            <if test="xu_city != null" >
+                xu_city,
+            </if>
+            <if test="xu_province != null" >
+                xu_province,
+            </if>
+            <if test="xu_country != null" >
+                xu_country,
+            </if>
+            <if test="xu_language != null" >
+                xu_language,
+            </if>
+            <if test="xu_ydate != null" >
+                xu_ydate,
+            </if>
+            <if test="xu_isauthorize != null" >
+                xu_isauthorize
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="xu_openid != null" >
+                #{xu_openid,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_sessionkey != null" >
+                #{xu_sessionkey,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_phone != null" >
+                #{xu_phone,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_name != null" >
+                #{xu_name,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_avatarUrl != null" >
+                #{xu_avatarUrl,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_gender != null" >
+                #{xu_gender,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_city != null" >
+                #{xu_city,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_province != null" >
+                #{xu_province,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_country != null" >
+                #{xu_country,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_language != null" >
+                #{xu_language,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_ydate != null" >
+                #{xu_ydate,jdbcType=DATE},
+            </if>
+            <if test="xu_isauthorize != null" >
+                #{xu_isauthorize,jdbcType=INTEGER}
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateWXUser" parameterType="com.ygj.yuemum.domain.wxmini.WXUser" >
+        update wx_user
+        <set >
+            <if test="xu_openid != null" >
+                xu_openid = #{xu_openid,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_sessionkey != null" >
+                xu_sessionkey = #{xu_sessionkey,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_phone != null" >
+                xu_phone = #{xu_phone,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_name != null" >
+                xu_name = #{xu_name,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_avatarUrl != null" >
+                xu_avatarUrl = #{xu_avatarUrl,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_gender != null" >
+                xu_gender = #{xu_gender,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_city != null" >
+                xu_city = #{xu_city,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_province != null" >
+                xu_province = #{xu_province,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_country != null" >
+                xu_country = #{xu_country,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_language != null" >
+                xu_language = #{xu_language,jdbcType=VARCHAR},
+            </if>
+            <if test="xu_ydate != null" >
+                xu_ydate = #{xu_ydate,jdbcType=DATE},
+            </if>
+            <if test="xu_isauthorize != null" >
+                xu_isauthorize = #{xu_isauthorize,jdbcType=INTEGER}
+            </if>
+        </set>
+        where xu_openid = #{xu_openid,jdbcType=VARCHAR}
+    </update>
+
+    <select id="getWXUserType" resultType="com.ygj.yuemum.domain.wxmini.WXUser" parameterType="java.lang.String">
+        select
+        count(1)
+        from wx_user
+        where xu_openid = #{xu_openid,jdbcType=VARCHAR}
+        order by id asc
+    </select>
+</mapper>