bug修復

common/src/main/java/com/winsun/utils/PicturesUtil.java

@@ -25,9 +25,10 @@ public class PicturesUtil {
      *
      * @param file 图片base64字符串
      * @param path 图片文件夹名
+     * @param replace 服务器更换路径
      * @return
      */
-    public static String uploadPictures(String file, String path){
+    public static String uploadPictures(String file, String path,String replace){
         Date date = new Date();
         SimpleDateFormat yyMM = new SimpleDateFormat("yyMM");
         String y = yyMM.format(date.getTime());
@@ -69,10 +70,11 @@ public class PicturesUtil {
                 }
             }
         }
-        String enclosure = filePath.replace("enclosure", "manager/ciop");
+        String enclosure = filePath.replace("enclosure", replace);
         return enclosure;
     }
 
+
     /**
      * 海报删除图片
      * @param fileName 删除图片地址

new-user/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -38,6 +38,7 @@ import java.util.*;
 @RestController
 @RequestMapping("/packageNewClothes")
 public class PackageNewClothes {
+    private static String REPLACE="new/ciop";
 
     private static AppMapper appMapper;
 
@@ -166,7 +167,7 @@ public class PackageNewClothes {
         instance.add(Calendar.DATE, -94);
         Date time = instance.getTime();
         Wrapper<Order> wrapper = new EntityWrapper();
-        wrapper.eq("social_id",idCard);
+        wrapper.eq("id_card",idCard);
         wrapper.gt("create_time", time);
         wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName());
         wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
@@ -189,10 +190,10 @@ public class PackageNewClothes {
         order.setPackageId(cardId);
         order.setCustomerName(customerName);
         order.setContactNumber(contactNumber);
-        order.setStudenCard(PicturesUtil.uploadPictures(studentCard, partner));
-        order.setIdCardzs(PicturesUtil.uploadPictures(idCardzs, partner));
-        order.setIdCardz(PicturesUtil.uploadPictures(idCardz, partner));
-        order.setIdCardf(PicturesUtil.uploadPictures(idCardf, partner));
+        order.setStudenCard(PicturesUtil.uploadPictures(studentCard, partner,REPLACE));
+        order.setIdCardzs(PicturesUtil.uploadPictures(idCardzs, partner,REPLACE));
+        order.setIdCardz(PicturesUtil.uploadPictures(idCardz, partner,REPLACE));
+        order.setIdCardf(PicturesUtil.uploadPictures(idCardf, partner,REPLACE));
         order.setRemarks(remarks);
         Date date = new Date();
         order.setCreateTime(date);
@@ -268,7 +269,7 @@ public class PackageNewClothes {
         instance.add(Calendar.DATE, -94);
         Date time = instance.getTime();
         Wrapper<Order> wrapper = new EntityWrapper();
-        wrapper.eq("social_id",idCard);
+        wrapper.eq("id_card",idCard);
         wrapper.gt("create_time", time);
         wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName());
         wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
@@ -291,9 +292,9 @@ public class PackageNewClothes {
         order.setCustomerName(customerName);
         order.setContactNumber(contactNumber);
         //图片处理
-        order.setIdCardzs(PicturesUtil.uploadPictures(idCardzs, partner));
-        order.setIdCardz(PicturesUtil.uploadPictures(idCardz, partner));
-        order.setIdCardf(PicturesUtil.uploadPictures(idCardf, partner));
+        order.setIdCardzs(PicturesUtil.uploadPictures(idCardzs, partner,REPLACE));
+        order.setIdCardz(PicturesUtil.uploadPictures(idCardz, partner,REPLACE));
+        order.setIdCardf(PicturesUtil.uploadPictures(idCardf, partner,REPLACE));
         order.setRemarks(remarks);
         order.setClassNumber(classNumber);
         order.setParentName(parentName);
@@ -386,7 +387,7 @@ public class PackageNewClothes {
         instance.add(Calendar.DATE, -94);
         Date time = instance.getTime();
         Wrapper<Order> wrapper = new EntityWrapper();
-        wrapper.eq("social_id",idCard);
+        wrapper.eq("id_card",idCard);
         wrapper.gt("create_time", time);
         wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName());
         wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
@@ -417,7 +418,7 @@ public class PackageNewClothes {
         order.setCustomerName(customerName);
         order.setContactNumber(contactNumber);
         order.setRemarks(remarks);
-        order.setStudenCard(PicturesUtil.uploadPictures(studentCard,partner));
+        order.setStudenCard(PicturesUtil.uploadPictures(studentCard,partner,REPLACE));
         order.setBusinessNumber(businessNumber);
         Date date = new Date();
         order.setCreateTime(date);

service-manager/src/main/java/com/winsun/controller/QRCodeController.java

@@ -34,6 +34,8 @@ import java.util.*;
 @RequestMapping("QRCpde")
 public class QRCodeController extends BaseController {
 
+    private static String REPLACEPC="manager/ciop";
+
     private static QRCodeMapper qrCodeMapper;
 
     private static SysUserMapper sysUserMapper;
@@ -48,7 +50,7 @@ public class QRCodeController extends BaseController {
     public ResponseData<String> uploadPicture(@RequestParam("picture") String picture) {
         ShiroUser user = getShiroUser();
         Integer userId=user.getId();
-        String path = PicturesUtil.uploadPictures(picture, userId.toString());
+        String path = PicturesUtil.uploadPictures(picture, userId.toString(),REPLACEPC);
         QRCode qrCode = new QRCode();
         qrCode.setId(UUID.randomUUID().toString());
         qrCode.setCreateTime(new Date());
@@ -87,24 +89,39 @@ public class QRCodeController extends BaseController {
 
     /**
      *移动端查询二维码图片列表
-     * @param enable
-     * @param size
+     * @param size 第几张图片
      * @return
      */
     @RequestMapping(value = "select", method = RequestMethod.POST)
-    public ResponseData<List<QRCode>> selectPicture(@RequestParam(name = "enable") String enable,@RequestParam(name = "size")Integer size) {
+    public ResponseData<List<QRCode>> selectPicture(String size) {
         Wrapper<QRCode> wrapper = new EntityWrapper();
-        wrapper.eq(StringUtils.isNotBlank(enable),"enable",enable);
+        wrapper.eq("enable","1");
        List<String> objects = new ArrayList<>();
         objects.add("create_time");
         wrapper.orderDesc(objects);
-        wrapper.last("limit "+size +" "+(size+1));
+        String str="limit "+size +","+(Integer.valueOf(size)+1);
+        wrapper.last(str);
         List<QRCode> qrCodes = qrCodeMapper.selectList(wrapper);
         if(qrCodes.size()==0){
             return ResponseData.error("没有生成二维码的背景图！");
         }
         return ResponseData.success(qrCodes, "查询成功！");
     }
+    /**
+     *移动端查询海报图片数量
+     * @return
+     */
+    @RequestMapping(value = "selectPictureCount", method = RequestMethod.POST)
+    public ResponseData<Integer> selectPictureCount() {
+        Wrapper<QRCode> wrapper = new EntityWrapper();
+        wrapper.eq("enable","1");
+        Integer integer = qrCodeMapper.selectCount(wrapper);
+        if(integer==0){
+            return ResponseData.error("没有生成二维码的背景图！");
+        }
+        return ResponseData.success(integer, "查询成功！");
+    }
+
 
     /**
      * 删除二维码图片