小程序banner管理，评论管理

pom.xml

@@ -174,13 +174,24 @@
 			<artifactId>shiro-spring</artifactId>
 			<version>1.3.2</version>
 		</dependency>
+
+		<!--热部署-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 
+
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<fork>true</fork>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

src/main/java/com/ygj/yuemum/component/Constant.java

@@ -57,6 +57,10 @@ public class Constant {
     public static String HTTPOPPQRCODE;
     public static String TESTQRCODE;
     public static String HTTTESTQRCODE;
+    public static String BANNERIMGURL;
+    public static String HTTPBANNERIMGURL;
+    public static String DIANPINGIMGURL;
+    public static String HTTPDIANPINGIMGURL;
 
     //注入
     @Autowired(required = false)
@@ -263,4 +267,26 @@ public class Constant {
         Constant.HTTTESTQRCODE = HTTTESTQRCODE;
     }
 
+    @Autowired(required = false)
+    public void getBANNERIMGURL(@Value("${file.BANNERIMGURL}") String BANNERIMGURL) {
+        Constant.BANNERIMGURL = BANNERIMGURL;
+    }
+
+    @Autowired(required = false)
+    public void getHTTPBANNERIMGURL(@Value("${file.HTTPBANNERIMGURL}") String HTTPBANNERIMGURL) {
+        Constant.HTTPBANNERIMGURL = HTTPBANNERIMGURL;
+    }
+
+    @Autowired(required = false)
+    public void getDIANPINGIMGURL(@Value("${file.DIANPINGIMGURL}") String DIANPINGIMGURL) {
+        Constant.DIANPINGIMGURL = DIANPINGIMGURL;
+    }
+
+    @Autowired(required = false)
+    public void getHTTPDIANPINGIMGURL(@Value("${file.HTTPDIANPINGIMGURL}") String HTTPDIANPINGIMGURL) {
+        Constant.HTTPDIANPINGIMGURL = HTTPDIANPINGIMGURL;
+    }
+
+
+
 }

src/main/java/com/ygj/yuemum/controller/bizobject/BizObjectController.java

@@ -1,16 +1,12 @@
 package com.ygj.yuemum.controller.bizobject;
 
 
-import com.ygj.yuemum.domain.admin.Branches;
-import com.ygj.yuemum.service.admin.BranchesService;
 import com.ygj.yuemum.service.bizobject.BizObjectApiService;
 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;
-
 @RestController
 public class BizObjectController {
 

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

@@ -1,83 +1,83 @@
-package com.ygj.yuemum.controller.equipment;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.ygj.yuemum.domain.equipment.EquipmenteHireHead;
-import com.ygj.yuemum.service.equipment.EquipmenteHireHeadService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@RestController
-public class EquipmenteHireHeadController {
-
-    @Autowired
-    private EquipmenteHireHeadService equipmenteHireHeadService;
-
-
-    @GetMapping("/getAllEquipmenteHireHeads")
-    public String getAllEquipmenteHireHeads(@RequestParam("page") Integer page, @RequestParam("limit") Integer limit) {
-        Map<String, Object> equipmenteHireHeadServiceAll = equipmenteHireHeadService.getAll(page, limit);
-        String jso = JSONObject.toJSONString(equipmenteHireHeadServiceAll);
-        return jso;
-    }
-
-    @PostMapping("/addEquipmenteHireHead")
-    public int addEquipmenteHireHead(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
-        return equipmenteHireHeadService.addEquipmenteHireHead(equipmenteHireHead);
-    }
-
-    @PostMapping("/addEquipmenteHireHeadOnline")
-    public int addEquipmenteHireHeadOnline(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
-        return equipmenteHireHeadService.addEquipmenteHireHeadOnline(equipmenteHireHead);
-    }
-
-    @PostMapping("/updateEquipmenteHireHeadOnline")
-    public int updateEquipmenteHireHeadOnline(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
-        return equipmenteHireHeadService.updateEquipmenteHireHeadOnline(equipmenteHireHead);
-    }
-
-    @GetMapping("/deleteEquipmenteHireHead")
-    public int deleteEquipmenteHireHead(@RequestParam("eh_code") String eh_code) {
-        return equipmenteHireHeadService.deleteEquipmenteHireHead(eh_code);
-    }
-
-    @PostMapping("/updateEquipmenteHireHead")
-    public int updateEquipmenteHireHead(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
-        return equipmenteHireHeadService.updateEquipmenteHireHead(equipmenteHireHead);
-    }
-
-    @PostMapping("/queryEquipmenteHireHead")
-    public String queryEquipmenteHireHead(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
-        Map<String, Object> equipmenteHireHead1 = equipmenteHireHeadService.queryEquipmenteHireHead(equipmenteHireHead);
-        String jso = JSONObject.toJSONString(equipmenteHireHead1);
-        return jso;
-    }
-
-    @GetMapping("/getEquipmenteHireHead")
-    public EquipmenteHireHead getOne(@RequestParam("eh_code") String eh_code) {
-        EquipmenteHireHead equipmenteHireHead = equipmenteHireHeadService.getEquipmenteHireHead(eh_code);
-        return equipmenteHireHead;
-    }
-
-    @PostMapping("/equipmentActive")
-    public int equipmentActive(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
-        return equipmenteHireHeadService.equipmentActive(equipmenteHireHead);
-    }
-
-    @PostMapping("/equipmentSettle")
-    public int equipmentSettle(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
-        return equipmenteHireHeadService.equipmentSettle(equipmenteHireHead);
-    }
-
-    @RequestMapping(value = "/WxPayReturn", method = RequestMethod.POST, produces="application/json;charset=UTF-8")
-    @ResponseBody
-    public int WxPayReturn(@RequestBody Map<String,String> params) {
-        EquipmenteHireHead equipmenteHireHead = new EquipmenteHireHead();
-        equipmenteHireHead.setEh_code(params.get("eh_code"));
-        equipmenteHireHead.setEh_status(2);
-        return equipmenteHireHeadService.updateEqorderStatus(equipmenteHireHead);
-    }
-
+package com.ygj.yuemum.controller.equipment;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.ygj.yuemum.domain.equipment.EquipmenteHireHead;
+import com.ygj.yuemum.service.equipment.EquipmenteHireHeadService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+public class EquipmenteHireHeadController {
+
+    @Autowired
+    private EquipmenteHireHeadService equipmenteHireHeadService;
+
+
+    @GetMapping("/getAllEquipmenteHireHeads")
+    public String getAllEquipmenteHireHeads(@RequestParam("page") Integer page, @RequestParam("limit") Integer limit) {
+        Map<String, Object> equipmenteHireHeadServiceAll = equipmenteHireHeadService.getAll(page, limit);
+        String jso = JSONObject.toJSONString(equipmenteHireHeadServiceAll);
+        return jso;
+    }
+
+    @PostMapping("/addEquipmenteHireHead")
+    public int addEquipmenteHireHead(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        return equipmenteHireHeadService.addEquipmenteHireHead(equipmenteHireHead);
+    }
+
+    @PostMapping("/addEquipmenteHireHeadOnline")
+    public int addEquipmenteHireHeadOnline(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        return equipmenteHireHeadService.addEquipmenteHireHeadOnline(equipmenteHireHead);
+    }
+
+    @PostMapping("/updateEquipmenteHireHeadOnline")
+    public int updateEquipmenteHireHeadOnline(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        return equipmenteHireHeadService.updateEquipmenteHireHeadOnline(equipmenteHireHead);
+    }
+
+    @GetMapping("/deleteEquipmenteHireHead")
+    public int deleteEquipmenteHireHead(@RequestParam("eh_code") String eh_code) {
+        return equipmenteHireHeadService.deleteEquipmenteHireHead(eh_code);
+    }
+
+    @PostMapping("/updateEquipmenteHireHead")
+    public int updateEquipmenteHireHead(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        return equipmenteHireHeadService.updateEquipmenteHireHead(equipmenteHireHead);
+    }
+
+    @PostMapping("/queryEquipmenteHireHead")
+    public String queryEquipmenteHireHead(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        Map<String, Object> equipmenteHireHead1 = equipmenteHireHeadService.queryEquipmenteHireHead(equipmenteHireHead);
+        String jso = JSONObject.toJSONString(equipmenteHireHead1);
+        return jso;
+    }
+
+    @GetMapping("/getEquipmenteHireHead")
+    public EquipmenteHireHead getOne(@RequestParam("eh_code") String eh_code) {
+        EquipmenteHireHead equipmenteHireHead = equipmenteHireHeadService.getEquipmenteHireHead(eh_code);
+        return equipmenteHireHead;
+    }
+
+    @PostMapping("/equipmentActive")
+    public int equipmentActive(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        return equipmenteHireHeadService.equipmentActive(equipmenteHireHead);
+    }
+
+    @PostMapping("/equipmentSettle")
+    public int equipmentSettle(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        return equipmenteHireHeadService.equipmentSettle(equipmenteHireHead);
+    }
+
+    @RequestMapping(value = "/WxPayReturn", method = RequestMethod.POST, produces="application/json;charset=UTF-8")
+    @ResponseBody
+    public int WxPayReturn(@RequestBody Map<String,String> params) {
+        EquipmenteHireHead equipmenteHireHead = new EquipmenteHireHead();
+        equipmenteHireHead.setEh_code(params.get("eh_code"));
+        equipmenteHireHead.setEh_status(2);
+        return equipmenteHireHeadService.updateEqorderStatus(equipmenteHireHead);
+    }
+
 }

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

@@ -1,22 +1,104 @@
-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;
-    }
+package com.ygj.yuemum.controller.wxmini;
+
+
+import com.ygj.yuemum.component.Constant;
+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.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.List;
+
+@RestController
+public class WXBannerController {
+
+    @Autowired
+    private WXBannerService wxBannerService;
+
+    public static final String BANNERIMGURL = Constant.BANNERIMGURL;
+    public static final String HTTPBANNERIMGURL = Constant.HTTPBANNERIMGURL;
+
+    @GetMapping("/getBanners")
+    public List<WXBanner> getBanners() {
+        List<WXBanner> wxBanners = wxBannerService.getBanners();
+        return wxBanners;
+    }
+
+    @GetMapping
+    public int cleanBanner(@RequestParam(value = "id") Integer id) {
+        try {
+            wxBannerService.cleanBanner(id);
+            WXBanner wxBannerOld = wxBannerService.getOldFile(id);
+            if (wxBannerOld.getWb_url() != null) {
+                String[] pathname = wxBannerOld.getWb_url().split("/");
+                String name = pathname[pathname.length - 1];
+                String delPath = BANNERIMGURL + name;
+                File delDest = new File(delPath);
+                delDest.delete();
+            }
+        }catch (Exception ex){
+         ex.printStackTrace();
+         return 0;
+        }
+        return 1;
+    }
+
+    @PostMapping("/updateBanner")
+    public int updateBanner(@ModelAttribute WXBanner wxBanner) {
+        return wxBannerService.updateBanner(wxBanner);
+    }
+
+    @GetMapping("/getChangBanners")
+    public List<WXBanner> getChangBanners() {
+        List<WXBanner> wxBanners = wxBannerService.getChangBanners();
+        return wxBanners;
+    }
+
+    @RequestMapping(value = "/uploadMiniImg", method = RequestMethod.POST)
+    @ResponseBody
+    public int uploadMiniImg(@RequestParam("file") MultipartFile file,
+                             @RequestParam(value = "id") Integer id) {
+        if (file.isEmpty()) {
+            return 0;
+        }
+        Calendar Cld = Calendar.getInstance();
+        int MI = Cld.get(Calendar.MILLISECOND);
+        int dot = file.getOriginalFilename().lastIndexOf('.');
+        String originalFilename = file.getOriginalFilename().substring(dot);
+        String path = BANNERIMGURL + "banner" + id + MI + originalFilename;
+
+        try {
+            File dest = new File(path);
+            file.transferTo(dest); //保存文件 覆盖之前
+            //删除文件
+            WXBanner wxBannerOld = wxBannerService.getOldFile(id);
+            if (wxBannerOld.getWb_url() != null) {
+                String[] pathname = wxBannerOld.getWb_url().split("/");
+                String name = pathname[pathname.length - 1];
+                String delPath = BANNERIMGURL + name;
+                File delDest = new File(delPath);
+                delDest.delete();
+            }
+
+            // 保存数据库
+            WXBanner wxBanner = new WXBanner();
+            wxBanner.setId(id);
+            wxBanner.setWb_url(HTTPBANNERIMGURL + "banner" + id + MI + originalFilename);
+            wxBannerService.updateBanner(wxBanner);
+
+        } catch (IllegalStateException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return 0;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return 0;
+        }
+
+        return 1;
+    }
 }

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

@@ -0,0 +1,129 @@
+package com.ygj.yuemum.controller.wxmini;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ygj.yuemum.component.Constant;
+import com.ygj.yuemum.domain.wxmini.WXDianPing;
+import com.ygj.yuemum.domain.wxmini.WXDianPingImages;
+import com.ygj.yuemum.service.wxmini.WXDianPingImagesService;
+import com.ygj.yuemum.service.wxmini.WXDianPingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+@RestController
+public class WXDianpingController {
+
+    @Autowired
+    private WXDianPingService wxDianPingService;
+    @Autowired
+    private WXDianPingImagesService wxDianPingImagesService;
+
+    public static final String DIANPINGIMGURL = Constant.DIANPINGIMGURL;
+    public static final String HTTPDIANPINGIMGURL = Constant.HTTPDIANPINGIMGURL;
+
+    @GetMapping("/getWXDianPings")
+    public List<WXDianPing> getWXDianPings() {
+        List<WXDianPing> wxBanners = wxDianPingService.getWXDianPings();
+        return wxBanners;
+    }
+
+
+    @PostMapping("/updateWXDianPing")
+    public int updateWXDianPing(@ModelAttribute WXDianPing wxDianPing) {
+        return wxDianPingService.updateWXDianPing(wxDianPing);
+    }
+
+    @RequestMapping(value = "/insertWXDianPing", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+    @ResponseBody
+    public int insertWXDianPing(@RequestParam Map<String, Object> jsonParam) {
+        WXDianPing wxDianPing = JSON.parseObject(JSON.toJSONString(jsonParam), WXDianPing.class);
+        JSONArray imageLists = JSONArray.parseArray(wxDianPing.getImage_list());
+        int dianPingID = wxDianPingService.getDianPingID();
+        for (int i = 0; i < imageLists.size(); i++) {
+            WXDianPingImages wxDianPingImages = new WXDianPingImages();
+            wxDianPingImages.setWd_id(dianPingID);
+            wxDianPingImages.setWdi_image_path(imageLists.getString(i));
+            wxDianPingImagesService.insertWXDianPingImages(wxDianPingImages);
+        }
+        wxDianPingService.insertWXDianPing(wxDianPing);
+        return 1;
+    }
+
+    @PostMapping("/queryWXDianPings")
+    public String queryWXDianPings(@ModelAttribute WXDianPing wxDianPing) {
+        Map<String, Object> orderTemps = wxDianPingService.queryWXDianPings(wxDianPing);
+        String jso = JSONObject.toJSONString(orderTemps);
+        return jso;
+    }
+
+    @PostMapping("/deleteWXDianPing")
+    public int deleteWXDianPing(@RequestParam("id") Integer id) {
+        try {
+            List<WXDianPingImages> wxDianPingImages = wxDianPingImagesService.getWXDianPingImages(id);
+            for (WXDianPingImages img :wxDianPingImages) {
+                String[] pathname = img.getWdi_image_path().split("/");
+                String name = pathname[pathname.length - 1];
+                String delPath = DIANPINGIMGURL + name;
+                File delDest = new File(delPath);
+                delDest.delete();
+            }
+            wxDianPingImagesService.deleteWXDianPingImage(id);
+            wxDianPingService.deleteWXDianPing(id);
+        }catch (Exception ex){
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
+    }
+
+    @RequestMapping(value = "/uploadDianPingImg", method = RequestMethod.POST)
+    @ResponseBody
+    public String uploadMiniImg(@RequestParam("file") MultipartFile file) {
+        if (file.isEmpty()) {
+            return null;
+        }
+        int dot = file.getOriginalFilename().lastIndexOf('.');
+        String originalFilename = file.getOriginalFilename().substring(dot);
+        String name = UUID.randomUUID().toString().replace("-", "");
+        String path = DIANPINGIMGURL + name + originalFilename;
+
+        try {
+            File dest = new File(path);
+            file.transferTo(dest); //保存文件 覆盖之前
+
+        } catch (IllegalStateException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return null;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+        return HTTPDIANPINGIMGURL + name + originalFilename;
+    }
+
+    @PostMapping("/deleteWXDianPingImage")
+    public int deleteWXDianPingImage(@RequestParam("filepath") String filepath) {
+        try {
+            String[] pathname = filepath.split("/");
+            String name = pathname[pathname.length - 1];
+            String delPath = DIANPINGIMGURL + name;
+            File delDest = new File(delPath);
+            delDest.delete();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+        return 1;
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package com.ygj.yuemum.controller.wxmini;
+
+
+import com.ygj.yuemum.domain.wxmini.WXDianPingImages;
+import com.ygj.yuemum.service.wxmini.WXDianPingImagesService;
+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;
+
+@RestController
+public class WXDianpingImagesController {
+
+    @Autowired
+    private WXDianPingImagesService wxDianPingImagesService;
+
+    @GetMapping("/getWXDianPingImages")
+    public List<WXDianPingImages> getWXDianPingImages(@RequestParam("wd_id") Integer wd_id) {
+        List<WXDianPingImages> wxDianPingImages = wxDianPingImagesService.getWXDianPingImages(wd_id);
+        return wxDianPingImages;
+    }
+}

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

@@ -1,12 +1,16 @@
-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();
+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();
+    List<WXBanner> getChangBanners();
+    WXBanner getOldFile(Integer id);
+    int updateBanner(WXBanner wxBanner);
+    int cleanBanner(Integer id);
 }

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

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.dao.wxmini;
+
+import com.ygj.yuemum.domain.wxmini.WXDianPing;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface WXDianPingDao {
+
+    List<WXDianPing> getWXDianPings();
+
+    int updateWXDianPing(WXDianPing wxDianping);
+
+    int insertWXDianPing(WXDianPing wxDianping);
+
+    List<WXDianPing> queryWXDianPings(WXDianPing wxDianPing);
+
+    int deleteWXDianPing(Integer id);
+
+    int getDianPingID();
+}

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

@@ -0,0 +1,18 @@
+package com.ygj.yuemum.dao.wxmini;
+
+import com.ygj.yuemum.domain.wxmini.WXDianPingImages;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface WXDianPingImagesDao {
+
+    List<WXDianPingImages> getWXDianPingImages(Integer wd_id);
+
+    int updateWXDianPingImages(WXDianPingImages wxDianPingImages);
+
+    int insertWXDianPingImages(WXDianPingImages wxDianPingImages);
+
+    int deleteWXDianPingImage(Integer wd_id);
+}

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

@@ -0,0 +1,134 @@
+package com.ygj.yuemum.domain.wxmini;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class WXDianPing {
+    private Integer id;
+    private String wd_username;
+    private String wd_date;
+    private Integer wd_result;
+    private Integer wd_city;
+    private String wd_comment;
+    private String wd_create_date;
+    private Integer wd_create_user;
+    private String wd_create_user_name;
+    private String image_list;
+    private String wd_commentShort;
+    private Integer imgs;
+    private Integer page;
+    private Integer limit;
+
+    public Integer getImgs() {
+        return imgs;
+    }
+
+    public void setImgs(Integer imgs) {
+        this.imgs = imgs;
+    }
+
+    public String getWd_commentShort() {
+        return wd_commentShort;
+    }
+
+    public void setWd_commentShort(String wd_commentShort) {
+        this.wd_commentShort = wd_commentShort;
+    }
+
+    public String getImage_list() {
+        return image_list;
+    }
+
+    public void setImage_list(String image_list) {
+        this.image_list = image_list;
+    }
+
+    public String getWd_create_user_name() {
+        return wd_create_user_name;
+    }
+
+    public void setWd_create_user_name(String wd_create_user_name) {
+        this.wd_create_user_name = wd_create_user_name;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getWd_username() {
+        return wd_username;
+    }
+
+    public void setWd_username(String wd_username) {
+        this.wd_username = wd_username;
+    }
+
+    public String getWd_date() {
+        return wd_date;
+    }
+
+    public void setWd_date(String wd_date) {
+        this.wd_date = wd_date;
+    }
+
+    public Integer getWd_result() {
+        return wd_result;
+    }
+
+    public void setWd_result(Integer wd_result) {
+        this.wd_result = wd_result;
+    }
+
+    public Integer getWd_city() {
+        return wd_city;
+    }
+
+    public void setWd_city(Integer wd_city) {
+        this.wd_city = wd_city;
+    }
+
+    public String getWd_comment() {
+        return wd_comment;
+    }
+
+    public void setWd_comment(String wd_comment) {
+        this.wd_comment = wd_comment;
+    }
+
+    public String getWd_create_date() {
+        return wd_create_date;
+    }
+
+    public void setWd_create_date(String wd_create_date) {
+        this.wd_create_date = wd_create_date;
+    }
+
+    public Integer getWd_create_user() {
+        return wd_create_user;
+    }
+
+    public void setWd_create_user(Integer wd_create_user) {
+        this.wd_create_user = wd_create_user;
+    }
+}

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

@@ -0,0 +1,94 @@
+package com.ygj.yuemum.domain.wxmini;
+
+public class WXDianPingImages {
+    private Integer id;
+    private Integer wd_id;
+    private String wdi_image_path;
+    private String status;
+    private String name;
+    private String size;
+    private String percentage;
+    private String uid;
+    private String url;
+    private String response;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSize() {
+        return size;
+    }
+
+    public void setSize(String size) {
+        this.size = size;
+    }
+
+    public String getPercentage() {
+        return percentage;
+    }
+
+    public void setPercentage(String percentage) {
+        this.percentage = percentage;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getResponse() {
+        return response;
+    }
+
+    public void setResponse(String response) {
+        this.response = response;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getWd_id() {
+        return wd_id;
+    }
+
+    public void setWd_id(Integer wd_id) {
+        this.wd_id = wd_id;
+    }
+
+    public String getWdi_image_path() {
+        return wdi_image_path;
+    }
+
+    public void setWdi_image_path(String wdi_image_path) {
+        this.wdi_image_path = wdi_image_path;
+    }
+}

src/main/java/com/ygj/yuemum/service/order/YSOrderService.java

@@ -295,9 +295,9 @@ public class YSOrderService {
                 ysOrderServiceLog.setOd_changeDate(sdf.format(new Date()));
                 ysOrderServiceLog.setOd_userid(ysOrder.getOd_user());
                 ysOrderServiceLogService.insertYSOrderServiceLog(ysOrderServiceLog);
-                //氚云调用
-//                ysOrder.setOd_biz_user(cp_objectId);
-//                bizObjectApiService.createObject(ysOrder,payName);
+//                氚云调用
+                ysOrder.setOd_biz_user(cp_objectId);
+                bizObjectApiService.createObject(ysOrder,payName);
             } else {
                 //支付尾款时第三次调用CRM接口
                 ysOrder.setOd_balancepay(ysOrder.getOd_order_pay_amount());
@@ -366,8 +366,8 @@ public class YSOrderService {
                         }
                     }
                 }
-                //氚云调用
-//                bizObjectApiService.createSecondPay(ysOrder,payName);
+//                氚云调用
+                bizObjectApiService.createSecondPay(ysOrder,payName);
             }
             // 更新订单状态,修改订单待付金额
             ysOrder.setOd_status(od_stauts);

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

@@ -1,22 +1,35 @@
-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();
-    }
-
-
+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();
+    }
+
+    public List<WXBanner> getChangBanners() {
+        return wxBannerDao.getChangBanners();
+    }
+
+    public WXBanner getOldFile(Integer id) {
+        return wxBannerDao.getOldFile(id);
+    }
+    public int updateBanner(WXBanner wxBanner) {
+        return wxBannerDao.updateBanner(wxBanner);
+    }
+    public int cleanBanner(Integer id){
+        return wxBannerDao.cleanBanner(id);
+    }
+
 }

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

@@ -0,0 +1,33 @@
+package com.ygj.yuemum.service.wxmini;
+
+import com.ygj.yuemum.dao.wxmini.WXDianPingImagesDao;
+import com.ygj.yuemum.domain.wxmini.WXDianPingImages;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class WXDianPingImagesService {
+
+    @Autowired
+
+    private WXDianPingImagesDao wxDianPingImagesDao;
+
+    public List<WXDianPingImages> getWXDianPingImages(Integer wd_id) {
+        return wxDianPingImagesDao.getWXDianPingImages(wd_id);
+    }
+
+    public int updateWXDianPingImages(WXDianPingImages wxDianPingImages) {
+        return wxDianPingImagesDao.updateWXDianPingImages(wxDianPingImages);
+    }
+
+    public int insertWXDianPingImages(WXDianPingImages wxDianPingImages) {
+        return wxDianPingImagesDao.insertWXDianPingImages(wxDianPingImages);
+    }
+
+    public  int deleteWXDianPingImage(Integer wd_id) {
+        return wxDianPingImagesDao.deleteWXDianPingImage(wd_id);
+    }
+
+}

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

@@ -0,0 +1,50 @@
+package com.ygj.yuemum.service.wxmini;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ygj.yuemum.dao.wxmini.WXDianPingDao;
+import com.ygj.yuemum.domain.order.YSOrder;
+import com.ygj.yuemum.domain.wxmini.WXDianPing;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class WXDianPingService {
+
+    @Autowired
+
+    private WXDianPingDao wxDianpingDao;
+
+    public List<WXDianPing> getWXDianPings() {
+        return wxDianpingDao.getWXDianPings();
+    }
+    public  Map<String, Object> queryWXDianPings(WXDianPing wxDianPing) {
+        PageHelper.startPage(wxDianPing.getPage(),wxDianPing.getLimit());
+        List<WXDianPing> wxDianPings = wxDianpingDao.queryWXDianPings(wxDianPing);
+        PageInfo<WXDianPing> pageInfo = new PageInfo<WXDianPing>(wxDianPings);
+        long count = pageInfo.getTotal(); //获取总记录数
+        Map<String, Object> tableData = new HashMap<>();
+        tableData.put("items", wxDianPings);
+        tableData.put("total", count);
+        return tableData;
+    }
+
+    public int updateWXDianPing(WXDianPing wxDianping) {
+        return wxDianpingDao.updateWXDianPing(wxDianping);
+    }
+
+    public int insertWXDianPing(WXDianPing wxDianping) {
+        return wxDianpingDao.insertWXDianPing(wxDianping);
+    }
+    public int deleteWXDianPing (Integer id) {
+        return wxDianpingDao.deleteWXDianPing(id);
+    }
+    public int getDianPingID() {
+        return wxDianpingDao.getDianPingID();
+    }
+
+}

src/main/java/com/ygj/yuemum/shiro/ShiroConfig.java

@@ -105,6 +105,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/uploadPromotionImg","anon");
         filterChainDefinitionMap.put("/uploadImg","anon");
         filterChainDefinitionMap.put("/uploadPayImg","anon");
+        filterChainDefinitionMap.put("/uploadMiniImg","anon");
+        filterChainDefinitionMap.put("/uploadDianPingImg","anon");
         //简历分享问题
         filterChainDefinitionMap.put("/getWeChatInfo","anon");
 //        //用户，需要角色权限 “user”

src/main/resources/application.yml

@@ -20,6 +20,11 @@ spring:
       file-size-threshold: 0
       max-file-size: 5M
       max-request-size: 5M
+  devtools:
+    restart:
+      enabled: true  #设置开启热部署
+    freemarker:
+      cache: false    #页面不加载缓存，修改即时生效
 pagehelper:
   helper-dialect: mysql
   reasonable: true
@@ -62,6 +67,10 @@ file:
   HTTPOPPQRCODE: "http://192.168.8.14:8080/MiniProgram/mgm/pop"
   TESTQRCODE: "C:/apache-tomcat-9.0.14/webapps/MiniProgram/promotion/test"
   HTTTESTQRCODE: "http://192.168.8.14:8080/MiniProgram/promotion/test/dc"
+  BANNERIMGURL: "C:/apache-tomcat-9.0.14/webapps/MiniProgram/index/banner/"
+  HTTPBANNERIMGURL: "http://127.0.0.1:8080/MiniProgram/index/banner/"
+  DIANPINGIMGURL: "C:/apache-tomcat-9.0.14/webapps/MiniProgram/dianping/"
+  HTTPDIANPINGIMGURL: "http://127.0.0.1:8080/MiniProgram/dianping/"
 #测试
 #file:
 #  ROOT : "/usr/local/apache-tomcat-8.5.30/webapps/resume/img/"
@@ -97,6 +106,10 @@ file:
 #  HTTPOPPQRCODE: "https://yuesuo.yueguanjia.com/MiniProgram/mgm/pop"
 #  TESTQRCODE: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/promotion/test"
 #  HTTTESTQRCODE: "https://yuesuo.yueguanjia.com/MiniProgram/promotion/test/dc"
+#  BANNERIMGURL: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/index/banner/"
+#  HTTPBANNERIMGURL: "https://yuesuo.yueguanjia.com/MiniProgram/index/banner/"
+#  DIANPINGIMGURL: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/dianping/"
+#  HTTPDIANPINGIMGURL: "https://yuesuo.yueguanjia.com/MiniProgram/dianping/"
 #微信公众号---------------------------------------------------
 wechat:
   APPID : "wx52852a3c47540fad"
@@ -124,7 +137,7 @@ baidu:
   BANKCARD: "https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard"
 api:
   MDJAPIURL: "http://120.55.37.107:8763/introduce/activity"
-  BIZOBJECTSERVICE: "http://121.199.23.175:8080/edw/h3/operateObjects"
+  BIZOBJECTSERVICE: "http://10.81.168.51:8090/edw/h3/operateObjects"
   BIZUSERSERVICE: "https://www.h3yun.com/OpenApi/Invoke"
 #  BIZOBJECTSERVICE: "http://192.168.1.213:8010/h3/operateObjects"
 

src/main/resources/mybatis/mapper/admin/JlAdminPermissionMapper.xml

@@ -1,60 +1,60 @@
-<?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.admin.JlAdminPermissionDao">
-
-    <!--获取所有数据-->
-    <select id="getPermissionParents" resultType="com.ygj.yuemum.domain.admin.JlAdminPermission"
-            parameterType="java.lang.String">
-        select
-        *
-        from jl_admin_permission
-        where jp_relation = 'parnets'
-        and id in (${_parameter})
-        order by jp_seq asc
-    </select>
-
-    <select id="getPermissionChildrens" resultType="com.ygj.yuemum.domain.admin.JlAdminPermission">
-        select
-        *
-        from jl_admin_permission
-        where jp_relation = 'childrens'
-        and jp_parentid = #{arg0}
-        and id in (${arg1})
-        order by jp_seq asc
-    </select>
-    <select id="getPermissionLists" resultType="java.lang.String"
-            parameterType="java.lang.Integer">
-        SELECT
-            group_concat(jrp_perid) jrp_perid
-        FROM
-            jl_admin_role_permission
-        WHERE
-            jrp_roleid = (
-		SELECT
-			id
-		FROM
-			jl_admin_role
-		WHERE
-			id  = #{id,jdbcType=INTEGER}
-	)
-    </select>
-
-    <select id="getRolePermissionParents" resultType="com.ygj.yuemum.domain.admin.JlAdminPermission">
-        select
-        id,jp_showname
-        from jl_admin_permission
-        where jp_relation = 'parnets'
-        order by jp_seq asc
-    </select>
-
-    <select id="getRolePermissionChildrens" resultType="com.ygj.yuemum.domain.admin.JlAdminPermission">
-        select
-        id,jp_showname
-        from jl_admin_permission
-        where jp_relation = 'childrens'
-        and jp_parentid = #{arg0}
-        order by jp_seq asc
-    </select>
-
-
+<?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.admin.JlAdminPermissionDao">
+
+    <!--获取所有数据-->
+    <select id="getPermissionParents" resultType="com.ygj.yuemum.domain.admin.JlAdminPermission"
+            parameterType="java.lang.String">
+        select
+        *
+        from jl_admin_permission
+        where jp_relation = 'parents'
+        and id in (${_parameter})
+        order by jp_seq asc
+    </select>
+
+    <select id="getPermissionChildrens" resultType="com.ygj.yuemum.domain.admin.JlAdminPermission">
+        select
+        *
+        from jl_admin_permission
+        where jp_relation = 'childrens'
+        and jp_parentid = #{arg0}
+        and id in (${arg1})
+        order by jp_seq asc
+    </select>
+    <select id="getPermissionLists" resultType="java.lang.String"
+            parameterType="java.lang.Integer">
+        SELECT
+            group_concat(jrp_perid) jrp_perid
+        FROM
+            jl_admin_role_permission
+        WHERE
+            jrp_roleid = (
+		SELECT
+			id
+		FROM
+			jl_admin_role
+		WHERE
+			id  = #{id,jdbcType=INTEGER}
+	)
+    </select>
+
+    <select id="getRolePermissionParents" resultType="com.ygj.yuemum.domain.admin.JlAdminPermission">
+        select
+        id,jp_showname
+        from jl_admin_permission
+        where jp_relation = 'parents'
+        order by jp_seq asc
+    </select>
+
+    <select id="getRolePermissionChildrens" resultType="com.ygj.yuemum.domain.admin.JlAdminPermission">
+        select
+        id,jp_showname
+        from jl_admin_permission
+        where jp_relation = 'childrens'
+        and jp_parentid = #{arg0}
+        order by jp_seq asc
+    </select>
+
+
 </mapper>

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

@@ -13,9 +13,53 @@
     <!--获取所有数据-->
     <select id="getBanners" resultType="com.ygj.yuemum.domain.wxmini.WXBanner" >
         select
-        id,wb_seq,wb_url,wb_href,wb_href_type
+        *
         from wx_banner
+        where not ISNULL(wb_url)
         order by wb_seq asc
     </select>
 
+    <select id="getChangBanners" resultType="com.ygj.yuemum.domain.wxmini.WXBanner" >
+        select
+        *
+        from wx_banner
+        order by id asc
+    </select>
+
+
+    <select id="getOldFile" resultType="com.ygj.yuemum.domain.wxmini.WXBanner" parameterType="java.lang.Integer" >
+        select
+        *
+        from wx_banner
+        where
+        id = #{id,jdbcType=INTEGER}
+    </select>
+
+
+    <update id="updateBanner" parameterType="com.ygj.yuemum.domain.wxmini.WXBanner" >
+        update wx_banner
+        <set >
+            <if test="wb_url != null" >
+                wb_url = #{wb_url,jdbcType=VARCHAR},
+            </if>
+            <if test="wb_href_type != null" >
+                wb_href_type = #{wb_href_type,jdbcType=VARCHAR},
+            </if>
+            <if test="wb_href != null" >
+                wb_href = #{wb_href,jdbcType=VARCHAR}
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <update id="cleanBanner" parameterType="java.lang.Integer" >
+        update wx_banner
+        set
+        wb_url = null,
+        wb_href_type = null,
+        wb_href = null
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+
 </mapper>

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

@@ -0,0 +1,64 @@
+<?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.WXDianPingImagesDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.wxmini.WXDianPingImages" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="wd_id" property="wd_id" jdbcType="INTEGER" />
+        <result column="wdi_image_path" property="wdi_image_path" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getWXDianPingImages" resultType="com.ygj.yuemum.domain.wxmini.WXDianPingImages" parameterType="java.lang.Integer">
+        select
+        *
+        from wx_dianping_images
+        where wd_id = #{wd_id,jdbcType=INTEGER}
+        order by id asc
+    </select>
+
+
+    <update id="updateWXDianPingImages" parameterType="com.ygj.yuemum.domain.wxmini.WXDianPingImages" >
+        update wx_dianping_images
+        <set >
+            <if test="wd_id != null" >
+                wd_id = #{wd_id,jdbcType=INTEGER},
+            </if>
+            <if test="wdi_image_path != null" >
+                wdi_image_path = #{wd_date,jdbcType=VARCHAR}
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+
+    <insert id="insertWXDianPingImages" parameterType="com.ygj.yuemum.domain.wxmini.WXDianPingImages" >
+        insert into wx_dianping_images
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="wd_id != null" >
+                wd_id,
+            </if>
+            <if test="wdi_image_path != null" >
+                wdi_image_path
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="wd_id != null" >
+                #{wd_id,jdbcType=INTEGER},
+            </if>
+            <if test="wdi_image_path != null" >
+                #{wdi_image_path,jdbcType=VARCHAR}
+            </if>
+        </trim>
+    </insert>
+
+    <delete id="deleteWXDianPingImage" parameterType="java.lang.Integer"  >
+        delete from wx_dianping_images
+        where wd_id = #{wd_id,jdbcType=INTEGER}
+    </delete>
+
+
+
+
+
+</mapper>

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

@@ -0,0 +1,148 @@
+<?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.WXDianPingDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.wxmini.WXDianPing" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="wd_username" property="wd_username" jdbcType="VARCHAR" />
+        <result column="wd_date" property="wd_date" jdbcType="DATE" />
+        <result column="wd_result" property="wd_result" jdbcType="INTEGER" />
+        <result column="wd_city" property="wd_city" jdbcType="INTEGER" />
+        <result column="wd_comment" property="wd_comment" jdbcType="VARCHAR" />
+        <result column="wd_create_date" property="wd_create_date" jdbcType="DATE" />
+        <result column="wd_create_user" property="wd_create_user" jdbcType="INTEGER" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getWXDianPings" resultType="com.ygj.yuemum.domain.wxmini.WXDianPing" >
+        select
+        *
+        from wx_dianping
+        order by id desc
+    </select>
+
+
+    <select id="queryWXDianPings" resultType="com.ygj.yuemum.domain.wxmini.WXDianPing" parameterType="com.ygj.yuemum.domain.wxmini.WXDianPing">
+        select
+        id,
+        wd_username,
+        DATE_FORMAT(wd_date,'%Y-%m-%d') wd_date,
+        wd_result,
+        wd_city,
+        wd_comment,
+        substring(wd_comment, 1, 10) wd_commentShort,
+        DATE_FORMAT(wd_create_date,'%Y-%m-%d') wd_create_date,
+        fgetuser_name(wd_create_user) wd_create_user_name,
+        IFNULL(tb.tj,0) imgs
+        from wx_dianping LEFT JOIN (select wd_id,count(1) tj from wx_dianping_images GROUP BY id) tb on wx_dianping.id = tb.wd_id
+        where 1=1
+        <if test="wd_username != null and wd_username != ''">
+            and wd_username like "%"#{wd_username,jdbcType=VARCHAR}"%"
+        </if>
+        <if test="wd_date != null and wd_date != ''">
+            and DATE_FORMAT(wd_date,'%Y-%m-%d') = DATE_FORMAT(#{wd_date,jdbcType=DATE},'%Y-%m-%d')
+        </if>
+        <if test="wd_result != null and wd_result != ''">
+            and wd_result = #{wd_result,jdbcType=INTEGER}
+        </if>
+        <if test="wd_create_date != null and wd_create_date != ''">
+            and DATE_FORMAT(wd_create_date,'%Y-%m-%d') = DATE_FORMAT(#{wd_create_date,jdbcType=DATE},'%Y-%m-%d')
+        </if>
+        order by id desc
+    </select>
+
+
+
+    <update id="updateWXDianPing" parameterType="com.ygj.yuemum.domain.wxmini.WXDianPing" >
+        update wx_dianping
+        <set >
+            <if test="wd_username != null" >
+                wd_username = #{wd_username,jdbcType=VARCHAR},
+            </if>
+            <if test="wd_date != null" >
+                wd_date = #{wd_date,jdbcType=DATE},
+            </if>
+            <if test="wd_result != null" >
+                wd_result = #{wd_result,jdbcType=INTEGER},
+            </if>
+            <if test="wd_city != null" >
+                wd_city = #{wd_city,jdbcType=INTEGER},
+            </if>
+            <if test="wd_comment != null" >
+                wd_comment = #{wd_comment,jdbcType=VARCHAR},
+            </if>
+            <if test="wd_create_date != null" >
+                wd_create_date = #{wd_create_date,jdbcType=DATE},
+            </if>
+            <if test="wd_create_user != null" >
+                wd_create_user = #{wd_create_user,jdbcType=INTEGER}
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+
+    <insert id="insertWXDianPing" parameterType="com.ygj.yuemum.domain.wxmini.WXDianPing" >
+        insert into wx_dianping
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="wd_username != null" >
+                wd_username,
+            </if>
+            <if test="wd_date != null" >
+                wd_date,
+            </if>
+            <if test="wd_result != null" >
+                wd_result,
+            </if>
+            <if test="wd_city != null" >
+                wd_city,
+            </if>
+            <if test="wd_comment != null" >
+                wd_comment,
+            </if>
+            <if test="wd_create_date != null" >
+                wd_create_date,
+            </if>
+            <if test="wd_create_user != null" >
+                wd_create_user
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="wd_username != null" >
+                #{wd_username,jdbcType=VARCHAR},
+            </if>
+            <if test="wd_date != null" >
+                #{wd_date,jdbcType=DATE},
+            </if>
+            <if test="wd_result != null" >
+                #{wd_result,jdbcType=INTEGER},
+            </if>
+            <if test="wd_city != null" >
+                #{wd_city,jdbcType=INTEGER},
+            </if>
+            <if test="wd_comment != null" >
+                #{wd_comment,jdbcType=VARCHAR},
+            </if>
+            <if test="wd_create_date != null" >
+                #{wd_create_date,jdbcType=DATE},
+            </if>
+            <if test="wd_create_user != null" >
+                #{wd_create_user,jdbcType=INTEGER}
+            </if>
+        </trim>
+    </insert>
+
+    <delete id="deleteWXDianPing" parameterType="java.lang.Integer"  >
+        delete from wx_dianping
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+
+    <select id="getDianPingID" resultType="java.lang.Integer" >
+        SELECT auto_increment
+        FROM information_schema.tables
+        where table_schema="yuemum"
+        and table_name="wx_dianping";
+    </select>
+
+
+</mapper>