Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java
#	yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/IDbOrderService.java
#	yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java

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

@@ -4,7 +4,6 @@ import java.util.List;
 import java.util.Arrays;
 
 import com.yongqi.common.core.domain.model.LoginUser;
-import com.yongqi.common.helper.LoginHelper;
 import com.yongqi.xinrenli.domain.DbOrder;
 import com.yongqi.xinrenli.domain.bo.DbOrderEditBo;
 import lombok.RequiredArgsConstructor;
@@ -47,7 +46,7 @@ public class DbOrderController extends BaseController {
      * 查询订单列表
      */
     @SaCheckPermission("xinrenli:order:list")
-    @RequestMapping("/list")
+    @GetMapping("/list")
     public TableDataInfo<DbOrderVo> list(DbOrderBo bo, PageQuery pageQuery) {
         return iDbOrderService.homeList(bo, pageQuery);
     }
@@ -56,7 +55,7 @@ public class DbOrderController extends BaseController {
      * 用户需求广场
      */
     @SaCheckPermission("xinrenli:order:userDemandSquare")
-    @RequestMapping("/userDemandSquare")
+    @GetMapping("/userDemandSquare")
     public TableDataInfo<DbOrderVo> userDemandSquare(DbOrderBo bo, PageQuery pageQuery) {
         return iDbOrderService.userDemandSquare(bo, pageQuery);
     }
@@ -65,7 +64,7 @@ public class DbOrderController extends BaseController {
      * 我的需求
      */
     @SaCheckPermission("xinrenli:order:MyNeeds")
-    @RequestMapping("/MyNeeds")
+    @GetMapping("/MyNeeds")
     public TableDataInfo<DbOrderVo> MyNeeds(DbOrderBo bo, PageQuery pageQuery) {
 //        LoginUser loginUser = getLoginUser();
         LoginUser loginUser = new LoginUser();
@@ -78,7 +77,7 @@ public class DbOrderController extends BaseController {
      */
     @SaCheckPermission("xinrenli:order:export")
     @Log(title = "订单", businessType = BusinessType.EXPORT)
-    @RequestMapping("/export")
+    @PostMapping("/export")
     public void export(DbOrderBo bo, HttpServletResponse response) {
         List<DbOrderVo> list = iDbOrderService.queryList(bo);
         ExcelUtil.exportExcel(list, "订单", DbOrderVo.class, response);
@@ -90,7 +89,7 @@ public class DbOrderController extends BaseController {
      * @param id 主键
      */
     @SaCheckPermission("xinrenli:order:particulars")
-    @RequestMapping("/particulars")
+    @GetMapping("/particulars")
     public R<DbOrderVo> getInfo(@NotNull(message = "主键不能为空")
                                 @RequestParam("id") Long id) {
         return R.ok(iDbOrderService.queryById(id));
@@ -102,7 +101,7 @@ public class DbOrderController extends BaseController {
     @SaCheckPermission("xinrenli:order:add")
     @Log(title = "订单", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @RequestMapping()
+    @PostMapping("/add")
     public R<Void> add(@Validated(AddGroup.class) @RequestBody DbOrderBo bo) {
         //        LoginUser loginUser = getLoginUser();
         LoginUser user = new LoginUser();
@@ -116,8 +115,8 @@ public class DbOrderController extends BaseController {
     @SaCheckPermission("xinrenli:order:edit")
     @Log(title = "订单", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @PutMapping("/edit")
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbOrderEditBo bo) {
+    @PostMapping("/edit")
+    public R<Void> edit(@RequestBody DbOrderEditBo bo) {
 //        LoginUser loginUser = getLoginUser();
         LoginUser loginUser = new LoginUser();
         loginUser.setUserId(1L);
@@ -131,12 +130,25 @@ public class DbOrderController extends BaseController {
      */
     @SaCheckPermission("xinrenli:order:remove")
     @Log(title = "订单", businessType = BusinessType.DELETE)
-    @RequestMapping("/remove")
+    @GetMapping("/remove")
     public R<Void> remove(@NotNull(message = "主键不能为空")
                           @RequestParam("id") Long id) {
         LoginUser loginUser = new LoginUser();
         return toAjax(iDbOrderService.deleteWithValidByIds(id, loginUser));
     }
+    /**
+     * 生成支付订单
+     *
+     * @param bo 主键串
+     */
+    @SaCheckPermission("xinrenli:order:createPay")
+    @Log(title = "订单", businessType = BusinessType.DELETE)
+    @PostMapping("/createPay")
+    public R<Void> createPay(@RequestBody DbOrderEditBo bo) {
+        LoginUser loginUser = new LoginUser();
+        return toAjax(iDbOrderService.createPay(bo, loginUser));
+    }
+
 
     /**
      * 下单

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

@@ -3,6 +3,8 @@ package com.yongqi.xinrenli.controller;
 import java.util.List;
 import java.util.Arrays;
 
+import com.yongqi.xinrenli.domain.DbCoupon;
+import com.yongqi.xinrenli.domain.bo.DbCouponBo;
 import lombok.RequiredArgsConstructor;
 
 import javax.servlet.http.HttpServletResponse;
@@ -44,21 +46,29 @@ public class DbUserCouponController extends BaseController {
      */
     @SaCheckPermission("xinrenli:userCoupon:list")
     @GetMapping("/list")
-    public TableDataInfo<DbUserCouponVo> list(DbUserCouponBo bo, PageQuery pageQuery) {
+    public TableDataInfo<DbCoupon> list(DbCouponBo bo, PageQuery pageQuery) {
         return iDbUserCouponService.queryPageList(bo, pageQuery);
     }
-
     /**
-     * 导出用户优惠券关联列表
+     * 用户优惠卷失效查询接口
      */
-    @SaCheckPermission("xinrenli:userCoupon:export")
-    @Log(title = "用户优惠券关联", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(DbUserCouponBo bo, HttpServletResponse response) {
-        List<DbUserCouponVo> list = iDbUserCouponService.queryList(bo);
-        ExcelUtil.exportExcel(list, "用户优惠券关联", DbUserCouponVo.class, response);
+    @SaCheckPermission("xinrenli:userCoupon:listLose")
+    @GetMapping("/listLose")
+    public TableDataInfo<DbCoupon> listLose(DbCouponBo bo, PageQuery pageQuery) {
+        return iDbUserCouponService.queryPageListLose(bo, pageQuery);
     }
 
+//    /**
+//     * 导出用户优惠券关联列表
+//     */
+//    @SaCheckPermission("xinrenli:userCoupon:export")
+//    @Log(title = "用户优惠券关联", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(DbUserCouponBo bo, HttpServletResponse response) {
+//        List<DbUserCouponVo> list = iDbUserCouponService.queryList(bo);
+//        ExcelUtil.exportExcel(list, "用户优惠券关联", DbUserCouponVo.class, response);
+//    }
+
     /**
      * 获取用户优惠券关联详细信息
      *

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/DbCoupon.java

@@ -59,5 +59,12 @@ public class DbCoupon {
      * 删除状态
      */
     private Integer deleteStatus;
-
+    /**
+     * 用户使用状态
+     */
+    private String useStatus;
+    /**
+     * 用户id
+     */
+    private Long userId;
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/DbUserComment.java

@@ -50,5 +50,8 @@ public class DbUserComment  {
      * 删除状态
      */
     private Integer deleteStatus;
-
+    /**
+     * 用户头像
+     */
+    private String userHead;
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbArticleBo.java

@@ -2,12 +2,14 @@ package com.yongqi.xinrenli.domain.bo;
 
 import com.yongqi.common.core.validate.AddGroup;
 import com.yongqi.common.core.validate.EditGroup;
+import com.yongqi.xinrenli.domain.vo.DbFileVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.*;
 
 import java.util.Date;
+import java.util.List;
 
 import com.yongqi.common.core.domain.BaseEntity;
 
@@ -64,5 +66,8 @@ public class DbArticleBo extends BaseEntity {
 //    @NotNull(message = "删除状态不能为空", groups = {AddGroup.class, EditGroup.class})
     private Integer deleteStatus;
 
-
+    /**
+     * 图片列表
+     */
+    private List<DbFileVo> fileVos;
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbCouponBo.java

@@ -83,6 +83,13 @@ public class DbCouponBo extends BaseEntity {
      */
 //    @NotNull(message = "删除状态不能为空", groups = {AddGroup.class, EditGroup.class})
     private Integer deleteStatus;
-
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 用户使用状态
+     */
+    private String useStatus;
 
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderBo.java

@@ -60,7 +60,7 @@ public class DbOrderBo extends BaseEntity {
      * 维修时间
      */
     @NotNull(message = "维修时间不能为空", groups = {AddGroup.class, EditGroup.class})
-    private Date repairTime;
+    private String repairTime;
 
     /**
      * 维修地址

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbUserCommentBo.java

@@ -69,6 +69,9 @@ public class DbUserCommentBo extends BaseEntity {
      */
 //    @NotNull(message = "删除状态不能为空", groups = {AddGroup.class, EditGroup.class})
     private Integer deleteStatus;
-
+    /**
+     * 用户头像
+     */
+    private String userHead;
 
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbUserFeedbackBo.java

@@ -61,13 +61,13 @@ public class DbUserFeedbackBo extends BaseEntity {
     /**
      * 修改时间
      */
-    @NotNull(message = "修改时间不能为空", groups = {AddGroup.class, EditGroup.class})
+//    @NotNull(message = "修改时间不能为空", groups = {AddGroup.class, EditGroup.class})
     private Date modifyTime;
 
     /**
      * 删除状态
      */
-    @NotNull(message = "删除状态不能为空", groups = {AddGroup.class, EditGroup.class})
+//    @NotNull(message = "删除状态不能为空", groups = {AddGroup.class, EditGroup.class})
     private Integer deleteStatus;
 
 

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

@@ -28,4 +28,6 @@ public interface DbOrderMapper extends BaseMapperPlus<DbOrderMapper, DbOrder, Db
     Page<DbOrderVo> homeList(@Param("page") Page<DbOrderVo> page, @Param(Constants.WRAPPER) Wrapper<DbOrder> queryWrapper);
 
     int updateOrder(DbOrderEditBo update);
+
+    Integer createPay(DbOrderEditBo bo);
 }

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

 package com.yongqi.xinrenli.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yongqi.xinrenli.domain.DbCoupon;
+import com.yongqi.xinrenli.domain.DbOrder;
 import com.yongqi.xinrenli.domain.DbUserCoupon;
+import com.yongqi.xinrenli.domain.bo.DbCouponBo;
+import com.yongqi.xinrenli.domain.vo.DbOrderVo;
 import com.yongqi.xinrenli.domain.vo.DbUserCouponVo;
 import com.yongqi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 用户优惠券关联Mapper接口
@@ -12,4 +21,7 @@ import com.yongqi.common.core.mapper.BaseMapperPlus;
  */
 public interface DbUserCouponMapper extends BaseMapperPlus<DbUserCouponMapper, DbUserCoupon, DbUserCouponVo> {
 
+    Page<DbCoupon> selectListPage(@Param("page") Page<DbCoupon> page, @Param(Constants.WRAPPER) Wrapper<DbCoupon> queryWrapper);
+
+    Page<DbCoupon> selectListLosePage(@Param("page") Page<DbCoupon> page, @Param(Constants.WRAPPER) Wrapper<DbCoupon> queryWrapper);
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/IDbOrderService.java

@@ -68,6 +68,8 @@ public interface IDbOrderService {
      */
     TableDataInfo<DbOrderVo> homeList(DbOrderBo bo, PageQuery pageQuery);
 
+    Boolean createPay(DbOrderEditBo bo, LoginUser loginUser);
+
     R orderPay(Long id, Long couponId, LoginUser loginUser);
 
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/IDbUserCouponService.java

 package com.yongqi.xinrenli.service;
 
+import com.yongqi.xinrenli.domain.DbCoupon;
+import com.yongqi.xinrenli.domain.bo.DbCouponBo;
 import com.yongqi.xinrenli.domain.vo.DbUserCouponVo;
 import com.yongqi.xinrenli.domain.bo.DbUserCouponBo;
 import com.yongqi.common.core.page.TableDataInfo;
@@ -24,12 +26,9 @@ public interface IDbUserCouponService {
     /**
      * 查询用户优惠券关联列表
      */
-    TableDataInfo<DbUserCouponVo> queryPageList(DbUserCouponBo bo, PageQuery pageQuery);
+    TableDataInfo<DbCoupon> queryPageList(DbCouponBo bo, PageQuery pageQuery);
+
 
-    /**
-     * 查询用户优惠券关联列表
-     */
-    List<DbUserCouponVo> queryList(DbUserCouponBo bo);
 
     /**
      * 新增用户优惠券关联
@@ -45,4 +44,8 @@ public interface IDbUserCouponService {
      * 校验并批量删除用户优惠券关联信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+    /**
+     * 用户优惠卷失效查询接口
+     */
+    TableDataInfo<DbCoupon> queryPageListLose(DbCouponBo bo, PageQuery pageQuery);
 }

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

@@ -8,8 +8,12 @@ import com.yongqi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yongqi.xinrenli.domain.DbFile;
 import com.yongqi.xinrenli.domain.DbUserComment;
 import com.yongqi.xinrenli.domain.vo.DbUserCommentVo;
+import com.yongqi.xinrenli.enums.DeleteStatusEnum;
+import com.yongqi.xinrenli.enums.FileEnumServiceType;
+import com.yongqi.xinrenli.mapper.DbFileMapper;
 import com.yongqi.xinrenli.mapper.DbUserCommentMapper;
 import com.yongqi.xinrenli.service.IDbUserCommentService;
 import lombok.RequiredArgsConstructor;
@@ -38,12 +42,18 @@ public class DbArticleServiceImpl implements IDbArticleService {
 
     private final DbUserCommentMapper commentMapper;
 
+    private final DbFileMapper fileMapper;
     /**
      * 查询文章
      */
     @Override
     public DbArticleVo queryById(Long id) {
-        return baseMapper.selectVoById(id);
+        DbArticleVo vo = baseMapper.selectVoById(id);
+        IPage<DbUserCommentVo> voPage = commentMapper.selectVoPage(new Page<DbUserComment>(1, 3), Wrappers.<DbUserComment>lambdaQuery()
+            .eq(DbUserComment::getArticleId, id)
+            .eq(DbUserComment::getDeleteStatus, 0));
+        vo.setCommentVos(voPage.getRecords());
+        return vo;
     }
 
     /**
@@ -93,6 +103,18 @@ public class DbArticleServiceImpl implements IDbArticleService {
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
+            fileMapper.delete(Wrappers.<DbFile>lambdaQuery()
+                .eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode())
+                .eq(DbFile::getServiceType, FileEnumServiceType.ARTICLE.getServiceTyp())
+                .eq(DbFile::getServiceId, bo.getId())
+            );
+            List<DbFile> files = BeanUtil.copyToList(bo.getFileVos(), DbFile.class);
+            files.forEach(file -> {
+                file.setServiceId(bo.getId());
+                file.setServiceType(FileEnumServiceType.ARTICLE.getServiceTyp());
+                file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
+            });
+            fileMapper.insertBatch(files);
         }
         return flag;
     }

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

@@ -132,8 +132,6 @@ public class DbOrderServiceImpl implements IDbOrderService {
     @Override
     @Transactional
     public Boolean updateByBo(DbOrderEditBo update, LoginUser user) {
-        update.setModifyTime(new Date());
-        update.setModifyTime(new Date());
         update.setModifyUser(user.getUserId().toString());
         boolean modify = baseMapper.updateOrder(update) > 0;
 
@@ -151,7 +149,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
             });
             fileMapper.insertBatch(files);
         }
-        return false;
+        return true;
     }
 
     /**
@@ -231,6 +229,18 @@ public class DbOrderServiceImpl implements IDbOrderService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<DbOrder> lqw = Wrappers.lambdaQuery();
         lqw.gt(bo.getActualAmount() != null, DbOrder::getActualAmount, bo.getActualAmount());
+        lqw.eq(bo.getUserId() != null, DbOrder::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), DbOrder::getTitle, bo.getTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getLinkman()), DbOrder::getLinkman, bo.getLinkman());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), DbOrder::getPhone, bo.getPhone());
+        lqw.eq(bo.getRepairTime() != null, DbOrder::getRepairTime, bo.getRepairTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getRepairAddress()), DbOrder::getRepairAddress, bo.getRepairAddress());
+        lqw.eq(bo.getBudget() != null, DbOrder::getBudget, bo.getBudget());
+        lqw.eq(bo.getStatus() != null, DbOrder::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getCreateUser()), DbOrder::getCreateUser, bo.getCreateUser());
+        lqw.eq(StringUtils.isNotBlank(bo.getModifyUser()), DbOrder::getModifyUser, bo.getModifyUser());
+        lqw.eq(bo.getModifyTime() != null, DbOrder::getModifyTime, bo.getModifyTime());
+        lqw.eq(bo.getDeleteStatus() != null, DbOrder::getDeleteStatus, bo.getDeleteStatus());
         return lqw;
     }
     /**
@@ -258,6 +268,11 @@ public class DbOrderServiceImpl implements IDbOrderService {
         return TableDataInfo.build(result);
     }
 
+    @Override
+    public Boolean createPay(DbOrderEditBo bo, LoginUser loginUser) {
+        return  baseMapper.createPay(bo) > 0;
+    }
+
     /**
      * 下单
      * @param orderId    订单id

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

@@ -6,6 +6,8 @@ import com.yongqi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yongqi.xinrenli.domain.DbCoupon;
+import com.yongqi.xinrenli.domain.bo.DbCouponBo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.yongqi.xinrenli.domain.bo.DbUserCouponBo;
@@ -42,28 +44,18 @@ public class DbUserCouponServiceImpl implements IDbUserCouponService {
      * 查询用户优惠券关联列表
      */
     @Override
-    public TableDataInfo<DbUserCouponVo> queryPageList(DbUserCouponBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<DbUserCoupon> lqw = buildQueryWrapper(bo);
-        Page<DbUserCouponVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+    public TableDataInfo<DbCoupon> queryPageList(DbCouponBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<DbCoupon> lqw = buildQueryWrapper(bo);
+        Page<DbCoupon> result = baseMapper.selectListPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
-    /**
-     * 查询用户优惠券关联列表
-     */
-    @Override
-    public List<DbUserCouponVo> queryList(DbUserCouponBo bo) {
-        LambdaQueryWrapper<DbUserCoupon> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
 
-    private LambdaQueryWrapper<DbUserCoupon> buildQueryWrapper(DbUserCouponBo bo) {
+
+    private LambdaQueryWrapper<DbCoupon> buildQueryWrapper(DbCouponBo bo) {
         Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<DbUserCoupon> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getCouponId() != null, DbUserCoupon::getCouponId, bo.getCouponId());
-        lqw.eq(bo.getUserId() != null, DbUserCoupon::getUserId, bo.getUserId());
-        lqw.eq(bo.getUseStatus() != null, DbUserCoupon::getUseStatus, bo.getUseStatus());
-        lqw.eq(bo.getModifyTime() != null, DbUserCoupon::getModifyTime, bo.getModifyTime());
+        LambdaQueryWrapper<DbCoupon> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, DbCoupon::getUserId, bo.getUserId());
         return lqw;
     }
 
@@ -108,4 +100,11 @@ public class DbUserCouponServiceImpl implements IDbUserCouponService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public TableDataInfo<DbCoupon> queryPageListLose(DbCouponBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<DbCoupon> lqw = buildQueryWrapper(bo);
+        Page<DbCoupon> result = baseMapper.selectListLosePage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
 }

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

@@ -36,7 +36,8 @@
     <select id="selectPageList" resultMap = "DbArticleVo">
         select art.*,df.*
         from db_article art
-                 left join db_file df on art.id = df.service_id and df.service_type = 'wenzhang' and df.delete_status = 0
+                 left join (select service_id,service_type,delete_status as de from db_file) df on art.id = df.service_id and df.service_type = 'wenzhang' and df.de = 0
+
         ${ew.getCustomSqlSegment}
     </select>
 </mapper>

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

@@ -59,12 +59,25 @@
         set title=#{title},
             linkman=#{linkman},
             phone=#{phone},
-            repair_time=#{repairTime},
+            repair_time= STR_TO_DATE(#{repairTime}, '%Y-%m-%d %H'),
             repair_address=#{repairAddress},
             budget=#{budget},
-            remark=#{actualAmount},
-            modify_name=#{remark},
-            modify_time=NOW()
+            remark=#{remark},
+            modify_user=#{modifyUser},
+            modify_time=NOW(),
+            status=#{status}
+        where id = #{id}
+    </update>
+    <update id="createPay" parameterType="com.yongqi.xinrenli.domain.bo.DbOrderEditBo">
+        update db_order
+        set
+        <if test="actualAmount != null and actualAmount != ''">
+            actual_amount=#{actualAmount},
+        </if>
+        <if test="reasonsForRejection != null and reasonsForRejection != ''">
+            reasons_for_rejection=#{reasonsForRejection},
+        </if>
+            status=#{status}
         where id = #{id}
     </update>
 </mapper>

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

@@ -12,6 +12,76 @@
         <result property="createTime" column="create_time"/>
         <result property="modifyTime" column="modify_time"/>
     </resultMap>
+    <resultMap type="com.yongqi.xinrenli.domain.DbCoupon" id="DbCouponResult">
+        <result property="couponType" column="coupon_type"/>
+        <result property="fullSubtraction" column="full_subtraction"/>
+        <result property="minUsed" column="min_used"/>
+        <result property="effectiveTime" column="effective_time"/>
+        <result property="failureTime" column="failure_time"/>
+        <result property="deleteStatus" column="delete_status"/>
+        <result property="useStatus" column="use_status"/>
+    </resultMap>
+    <select id="selectListPage" resultMap="DbCouponResult">
+        SELECT
+            c.coupon_type,
+            c.full_subtraction,
+            min_used,
+            effective_time,
+            failure_time,
+            delete_status,
+            use_status
+        FROM
+            db_coupon c
+                INNER JOIN
+            db_user_coupon uc ON c.id=uc.coupon_id
+            ${ew.getCustomSqlSegment} and failure_time>now() and delete_status='0' and use_status='0'
 
-
+    </select>
+    <select id="selectListLosePage" resultMap="DbCouponResult">
+        select t.* from (SELECT
+        c.coupon_type,
+        c.full_subtraction,
+        min_used,
+        effective_time,
+        failure_time,
+        delete_status,
+        use_status,
+        uc.user_id
+        FROM
+        db_coupon c
+        INNER JOIN
+        db_user_coupon uc ON c.id=uc.coupon_id
+        where c.failure_time&lt;NOW()
+        union
+        SELECT
+        c.coupon_type,
+        c.full_subtraction,
+        min_used,
+        effective_time,
+        failure_time,
+        delete_status,
+        use_status,
+        uc.user_id
+        FROM
+        db_coupon c
+        INNER JOIN
+        db_user_coupon uc ON c.id=uc.coupon_id
+        where uc.use_status='1'
+        union
+        SELECT
+        c.coupon_type,
+        c.full_subtraction,
+        min_used,
+        effective_time,
+        failure_time,
+        delete_status,
+        use_status,
+        uc.user_id
+        FROM
+        db_coupon c
+        INNER JOIN
+        db_user_coupon uc ON c.id=uc.coupon_id
+        where c.delete_status='1') t
+        ${ew.getCustomSqlSegment}
+    </select>
 </mapper>