Merge remote-tracking branch 'origin/master'

yongqi-admin/src/main/resources/application.yml

@@ -263,3 +263,6 @@ management:
       show-details: ALWAYS
       show-details: ALWAYS
     logfile:
     logfile:
       external-file: ./logs/sys-console.log
       external-file: ./logs/sys-console.log
+# 图片视频语言上传地址
+document:
+  uploadPath: /opt/xinrenli/image/

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbFileController.java

 package com.yongqi.xinrenli.controller;
 package com.yongqi.xinrenli.controller;
 
 
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.Arrays;
 import java.util.Arrays;
+import java.util.UUID;
 
 
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 import javax.validation.constraints.*;
 
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import com.yongqi.common.annotation.RepeatSubmit;
 import com.yongqi.common.annotation.RepeatSubmit;
@@ -24,6 +31,7 @@ import com.yongqi.xinrenli.domain.vo.DbFileVo;
 import com.yongqi.xinrenli.domain.bo.DbFileBo;
 import com.yongqi.xinrenli.domain.bo.DbFileBo;
 import com.yongqi.xinrenli.service.IDbFileService;
 import com.yongqi.xinrenli.service.IDbFileService;
 import com.yongqi.common.core.page.TableDataInfo;
 import com.yongqi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 
 /**
 /**
  * 文件
  * 文件
@@ -39,6 +47,8 @@ public class DbFileController extends BaseController {
 
 
     private final IDbFileService iDbFileService;
     private final IDbFileService iDbFileService;
 
 
+    @Value("${document.uploadPath}")
+    private String uploadPath;
     /**
     /**
      * 查询文件列表
      * 查询文件列表
      */
      */
@@ -105,4 +115,38 @@ public class DbFileController extends BaseController {
                           @PathVariable Long[] ids) {
                           @PathVariable Long[] ids) {
         return toAjax(iDbFileService.deleteWithValidByIds(Arrays.asList(ids), true));
         return toAjax(iDbFileService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
     }
+    @SaCheckPermission("xinrenli:file:upload")
+    @Log(title = "文件", businessType = BusinessType.DELETE)
+    @PostMapping("/upload")
+    public String upload(MultipartFile file, HttpServletRequest req) {
+        if(!file.isEmpty()){
+            String uploadPath = "C:\\uploadFile";
+            // 如果目录不存在则创建
+            File uploadDir = new File(uploadPath);
+            if (!uploadDir.exists()) {
+                uploadDir.mkdir();
+            }
+            String OriginalFilename = file.getOriginalFilename();//获取原文件名
+            String suffixName = OriginalFilename.substring(OriginalFilename.lastIndexOf("."));//获取文件后缀名
+            //重新随机生成名字
+            String filename = UUID.randomUUID().toString() +suffixName;
+            File localFile = new File(uploadPath+"\\"+filename);
+            try {
+                file.transferTo(localFile); //把上传的文件保存至本地
+                /**
+                 * 这里应该把filename保存到数据库,供前端访问时使用
+                 */
+                return localFile.getPath();//上传成功，返回保存的文件地址
+            }catch (IOException e){
+                e.printStackTrace();
+                System.out.println("上传失败");
+                return "";
+            }
+        }else{
+            System.out.println("文件为空");
+            return "";
+        }
+
+    }
+
 }
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java

@@ -107,7 +107,7 @@ public class DbOrderController extends BaseController {
     public R<Void> add(@Validated(AddGroup.class) @RequestBody DbOrderBo bo) {
     public R<Void> add(@Validated(AddGroup.class) @RequestBody DbOrderBo bo) {
         //        LoginUser loginUser = getLoginUser();
         //        LoginUser loginUser = getLoginUser();
         LoginUser user = new LoginUser();
         LoginUser user = new LoginUser();
-        user.setUserId(1L);
+        user.setUserId(bo.getUserId());
         return toAjax(iDbOrderService.insertByBo(bo, user));
         return toAjax(iDbOrderService.insertByBo(bo, user));
     }
     }
 
 
@@ -118,10 +118,10 @@ public class DbOrderController extends BaseController {
     @Log(title = "订单", businessType = BusinessType.UPDATE)
     @Log(title = "订单", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @RepeatSubmit()
     @PostMapping("/edit")
     @PostMapping("/edit")
-    public R<Void> edit(@RequestBody DbOrderEditBo bo) {
+    public R<Void> edit(@Validated(EditGroup.class)@RequestBody DbOrderEditBo bo) {
 //        LoginUser loginUser = getLoginUser();
 //        LoginUser loginUser = getLoginUser();
         LoginUser loginUser = new LoginUser();
         LoginUser loginUser = new LoginUser();
-        loginUser.setUserId(1L);
+        loginUser.setUserId(bo.getUserId());
         return toAjax(iDbOrderService.updateByBo(bo, loginUser));
         return toAjax(iDbOrderService.updateByBo(bo, loginUser));
     }
     }
 
 

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/ReportFormsVo.java

@@ -23,26 +23,32 @@ public class ReportFormsVo {
     /**
     /**
      * 已完成订单总量
      * 已完成订单总量
      */
      */
+    @ExcelProperty(value = "已完成订单总量")
     private Integer accomplish;
     private Integer accomplish;
     /**
     /**
      * 已驳回订单总量
      * 已驳回订单总量
      */
      */
+    @ExcelProperty(value = "已驳回订单总量")
     private Integer reject;
     private Integer reject;
     /**
     /**
      *已退款订单总量
      *已退款订单总量
      */
      */
+    @ExcelProperty(value = "已退款订单总量")
     private Integer refund;
     private Integer refund;
     /**
     /**
      *累计成交金额
      *累计成交金额
      */
      */
-    private Integer totalMoney;
+    @ExcelProperty(value = "累计成交金额")
+    private String totalMoney;
     /**
     /**
      * 已完成订单
      * 已完成订单
      */
      */
+    @ExcelProperty(value = "已完成订单")
     private Integer doneOrder;
     private Integer doneOrder;
     /**
     /**
      * 未完成订单
      * 未完成订单
      */
      */
+    @ExcelProperty(value = "未完成订单")
     private Integer noDoneOrder;
     private Integer noDoneOrder;
 
 
 }
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/mapper/DbCouponMapper.java

 package com.yongqi.xinrenli.mapper;
 package com.yongqi.xinrenli.mapper;
 
 
 import com.yongqi.xinrenli.domain.DbCoupon;
 import com.yongqi.xinrenli.domain.DbCoupon;
+import com.yongqi.xinrenli.domain.bo.DbCouponBo;
 import com.yongqi.xinrenli.domain.vo.DbCouponVo;
 import com.yongqi.xinrenli.domain.vo.DbCouponVo;
 import com.yongqi.common.core.mapper.BaseMapperPlus;
 import com.yongqi.common.core.mapper.BaseMapperPlus;
 
 

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/mapper/DbUserCouponMapper.java

@@ -14,6 +14,8 @@ import com.yongqi.xinrenli.domain.vo.DbUserCouponVo;
 import com.yongqi.common.core.mapper.BaseMapperPlus;
 import com.yongqi.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
+import java.util.List;
+
 /**
 /**
  * 用户优惠券关联Mapper接口
  * 用户优惠券关联Mapper接口
  *
  *
@@ -25,4 +27,8 @@ public interface DbUserCouponMapper extends BaseMapperPlus<DbUserCouponMapper, D
     Page<DbCouponVo> selectListPage(@Param("page") Page<DbCouponVo> page, @Param(Constants.WRAPPER) Wrapper<DbUserCoupon> queryWrapper);
     Page<DbCouponVo> selectListPage(@Param("page") Page<DbCouponVo> page, @Param(Constants.WRAPPER) Wrapper<DbUserCoupon> queryWrapper);
 
 
     Page<DbCouponVo> selectListLosePage(@Param("page") Page<DbCouponVo> page, @Param(Constants.WRAPPER) Wrapper<DbUserCoupon> queryWrapper);
     Page<DbCouponVo> selectListLosePage(@Param("page") Page<DbCouponVo> page, @Param(Constants.WRAPPER) Wrapper<DbUserCoupon> queryWrapper);
+
+    void insertUserCoupon(@Param("id")Long id);
+
+    List<DbCoupon> ListUser();
 }
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbCouponServiceImpl.java

@@ -7,6 +7,8 @@ import com.yongqi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yongqi.xinrenli.domain.DbUserCoupon;
+import com.yongqi.xinrenli.mapper.DbUserCouponMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import com.yongqi.xinrenli.domain.bo.DbCouponBo;
 import com.yongqi.xinrenli.domain.bo.DbCouponBo;
@@ -30,7 +32,7 @@ import java.util.Collection;
 public class DbCouponServiceImpl implements IDbCouponService {
 public class DbCouponServiceImpl implements IDbCouponService {
 
 
     private final DbCouponMapper baseMapper;
     private final DbCouponMapper baseMapper;
-
+    private final DbUserCouponMapper dbUserCouponMapper;
     /**
     /**
      * 查询优惠卷
      * 查询优惠卷
      */
      */
@@ -83,6 +85,9 @@ public class DbCouponServiceImpl implements IDbCouponService {
         boolean flag = baseMapper.insert(add) > 0;
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
         if (flag) {
             bo.setId(add.getId());
             bo.setId(add.getId());
+            if("0".equals(bo.getCouponType())){
+                dbUserCouponMapper.insertUserCoupon(add.getId());
+            }
         }
         }
         return flag;
         return flag;
     }
     }

yongqi-xinrenli/src/main/resources/mapper/DbCouponMapper.xml

@@ -18,5 +18,4 @@
         <result property="deleteStatus" column="delete_status"/>
         <result property="deleteStatus" column="delete_status"/>
     </resultMap>
     </resultMap>
 
 
-
 </mapper>
 </mapper>

yongqi-xinrenli/src/main/resources/mapper/DbUserCouponMapper.xml

@@ -84,4 +84,10 @@
         where c.delete_status='1') t
         where c.delete_status='1') t
         ${ew.getCustomSqlSegment}
         ${ew.getCustomSqlSegment}
     </select>
     </select>
+    <insert id="insertUserCoupon" parameterType="java.lang.Long">
+        insert into db_user_coupon(coupon_id,user_id,use_status,create_time,modify_time)  select #{id},t.id,'0',NOW(),NOW() from db_wx_user t
+    </insert>
+
+
+
 </mapper>
 </mapper>