修改支付宝，banner图相关功能

lift-quan-service/src/main/java/cn/com/ty/lift/quan/pay/controller/PayController.java

@@ -27,8 +27,8 @@ public class PayController {
     private final UserInfoServiceImpl payService;
 
     /**
-     * @param
-     * @return
+     * @param userInfo 用户id，支付宝账号
+     * @return 操作结果
      * @description 绑定/换绑支付宝账号
      * @date 2019/12/26 14:28
      */
@@ -37,6 +37,12 @@ public class PayController {
         return payService.bind(userInfo);
     }
 
+    /**
+     * @param userInfo 用户id
+     * @return 操作结果
+     * @description 用户信息
+     * @date 2020/01/06 09:41
+     */
     @PostMapping("/info")
     public RestResponse balance(@RequestBody UserInfo userInfo) {
         UserInfo byId = payService.getById(userInfo.getUserId());
@@ -47,13 +53,13 @@ public class PayController {
     }
 
     /**
-     * @return
+     * @param req task 1创建充值订单 2提现审核订单,userId,
+     * @return 操作结果
      * @description 创建订单
      * @date 2019/12/26 16:05
-     * // @param type 1创建充值订单 2提现审核订单
      */
     @PostMapping("/create")
-    public RestResponse pay(@RequestBody PayReq req) throws AlipayApiException {
+    public RestResponse pay(@RequestBody PayReq req) {
         return payService.pay(req);
     }
 

lift-quan-service/src/main/java/cn/com/ty/lift/quan/pay/dao/entity/PayRecord.java

@@ -72,6 +72,12 @@ public class PayRecord implements Serializable {
     @TableField("subject")
     private String subject;
 
+    /**
+     * 订单备注
+     */
+    @TableField("subject_remark")
+    private String subjectRemark;
+
     /**
      * 订单创建时间
      */

lift-quan-service/src/main/java/cn/com/ty/lift/quan/pay/service/impl/UserInfoServiceImpl.java

@@ -36,9 +36,12 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
 
     public RestResponse bind(UserInfo userInfo) {
         UserInfo byId = this.getById(userInfo.getUserId());
-        //获取前端传过来的支付宝账号
-        if (this.saveOrUpdate(byId)) {
-            return RestResponse.success(null, "成功");
+        if (byId != null) {
+            byId.setAlipayAccount(userInfo.getAlipayAccount());
+            //获取前端传过来的支付宝账号
+            if (this.saveOrUpdate(byId)) {
+                return RestResponse.success(null, "成功");
+            }
         }
         return RestResponse.fail();
     }
@@ -47,7 +50,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
      * @description 创建充值订单，创建提现待审核订单
      * @date 2019/12/27 10:35
      */
-    public RestResponse pay(PayReq req) throws AlipayApiException {
+    public RestResponse pay(PayReq req) {
         if (req.getTotalAmount().compareTo(BigDecimal.ZERO) < 1) {
             return RestResponse.fail("金额必须大于0");
         }
@@ -62,6 +65,8 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         record.setOutTradeNo(outTradeNo);
         //设置订单标题
         record.setSubject(req.getSubject());
+        //设置订单备注
+        record.setSubjectRemark(req.getBody());
         //设置订单创建时间
         record.setCreateDatetime(LocalDateTime.now());
         //设置订单状态
@@ -71,8 +76,13 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         //task 1 创建充值订单
         if (req.getTask().equals(1)) {
             //向支付宝发创建充值订单请求
-            tradeNo = AlipayUtil
-                    .create(byId.getAlipayAccount(), outTradeNo, req.getSubject(), req.getBody(), req.getTotalAmount());
+            try {
+                tradeNo = AlipayUtil
+                        .create(byId.getAlipayAccount(), outTradeNo, req.getSubject(), req.getBody(), req.getTotalAmount());
+            } catch (AlipayApiException e) {
+                e.printStackTrace();
+                throw new RuntimeException("支付宝创建订单失败");
+            }
             if (tradeNo != null) {
                 record.setType(1);
                 record.setTradeNo(tradeNo);
@@ -114,7 +124,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     }
 
     /**
-     * @param //用户id,资金操作记录id
+     * @param req 用户id,资金操作记录id
      * @return status 1完成 0未完成
      * @description 审核订单
      * @date 2019/12/27 14:50

lift-system-service/src/main/java/cn/com/ty/lift/system/banner/dao/entity/BannerImage.java

@@ -32,8 +32,8 @@ public class BannerImage implements Serializable {
     /**
      * banner图文件名
      */
-    @TableField("image_name")
-    private String imageName;
+    @TableField("image")
+    private String image;
 
     /**
      * banner图序号
@@ -47,5 +47,4 @@ public class BannerImage implements Serializable {
     @TableField("type")
     private Integer type;
 
-
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/banner/service/impl/BannerImageServiceImpl.java

@@ -27,7 +27,7 @@ public class BannerImageServiceImpl extends ServiceImpl<BannerImageMapper, Banne
 
     public RestResponse upFile(MultipartFile file) {
         String originalFilename = file.getOriginalFilename();
-        if (originalFilename != null && originalFilename.contains(".")) {
+        if (null != originalFilename && originalFilename.contains(".")) {
             String fileName = "banner/image/" + IdWorker.getIdStr()
                     + "."
                     + originalFilename.substring(file.getOriginalFilename().lastIndexOf(".") + 1);
@@ -47,9 +47,11 @@ public class BannerImageServiceImpl extends ServiceImpl<BannerImageMapper, Banne
     }
 
     public RestResponse modify(BannerImage bannerImage) {
-        BannerImage byId = this.getById(bannerImage);
-        if (byId.getImageName() != null) {
-            AliyunOSSUtil.me().deleteObject(byId.getImageName());
+        if (null != bannerImage.getId()) {
+            BannerImage byId = this.getById(bannerImage.getId());
+            if (null != byId && null != byId.getImage()) {
+                AliyunOSSUtil.me().deleteObject(byId.getImage());
+            }
         }
         if (this.saveOrUpdate(bannerImage)) {
             return RestResponse.success(bannerImage.getId(), "成功");
@@ -59,8 +61,8 @@ public class BannerImageServiceImpl extends ServiceImpl<BannerImageMapper, Banne
 
     public RestResponse delete(BannerImage bannerImage) {
         BannerImage byId = this.getById(bannerImage);
-        if (byId.getImageName() != null) {
-            AliyunOSSUtil.me().deleteObject(byId.getImageName());
+        if (null != byId.getImage()) {
+            AliyunOSSUtil.me().deleteObject(byId.getImage());
         }
         if (this.removeById(bannerImage)) {
             return RestResponse.success(null, "成功");
@@ -70,13 +72,13 @@ public class BannerImageServiceImpl extends ServiceImpl<BannerImageMapper, Banne
 
     public RestResponse banners(BannerImage banner) {
         List<BannerImage> banners = this.list(new QueryWrapper<BannerImage>()
-                .eq(banner.getType() != null, "type", banner.getType())
+                .eq(null != banner.getType(), "type", banner.getType())
                 .orderByAsc("serial_no"));
         if (banners.isEmpty()) {
             return RestResponse.success();
         }
         for (BannerImage bannerImage : banners) {
-            bannerImage.setImageName("https://temp15827479607.oss-cn-beijing.aliyuncs.com/" + bannerImage.getImageName());
+            bannerImage.setImage("https://temp15827479607.oss-cn-beijing.aliyuncs.com/" + bannerImage.getImage());
         }
         return RestResponse.success(banners);
     }

lift-system-service/src/main/java/cn/com/ty/lift/system/faq/controller/FaqController.java

@@ -70,7 +70,7 @@ public class FaqController {
      */
     public RestResponse updateOne(@RequestBody Faq faq) {
         if (faqService.updateById(faq)) {
-            return RestResponse.success(null,"成功");
+            return RestResponse.success(null, "成功");
         }
         return RestResponse.fail();
     }

lift-system-service/src/main/java/cn/com/ty/lift/system/faq/dao/mapper/FaqMapper.java

@@ -2,8 +2,6 @@ package cn.com.ty.lift.system.faq.dao.mapper;
 
 import cn.com.ty.lift.system.faq.dao.entity.Faq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
 
 
 /**
@@ -14,7 +12,5 @@ import org.springframework.stereotype.Repository;
  * @author wang-hai-cheng
  * @since 2019-11-21
  */
-@Mapper
-@Repository
 public interface FaqMapper extends BaseMapper<Faq> {
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/controller/GlobalSetController.java

@@ -1,13 +1,15 @@
 package cn.com.ty.lift.system.settings.controller;
 
 
-import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.system.settings.dao.entity.GlobalSet;
 import cn.com.ty.lift.system.settings.service.impl.GlobalSetServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.time.Clock;
 import java.time.LocalDateTime;
@@ -23,7 +25,7 @@ import java.util.List;
  * @since 2019-12-13
  */
 @RestController
-@RequestMapping("/global-set")
+@RequestMapping("/set")
 @AllArgsConstructor
 public class GlobalSetController {
     private final GlobalSetServiceImpl globalSetService;
@@ -34,15 +36,15 @@ public class GlobalSetController {
      * @description 获取维保公司的全局设置列表
      * @date 2019/12/13 16:23
      */
-    @PostMapping
+    @PostMapping("list")
     public RestResponse sets(@RequestBody GlobalSet globalSet) {
         List<GlobalSet> globalSets = globalSetService
                 .list(new QueryWrapper<GlobalSet>()
                         .eq("company_id", globalSet.getCompanyId()));
         if (globalSets.isEmpty()) {
-            return RestResponse.success(null, ApiConstants.RESULT_NO_DATA, "无数据");
+            return RestResponse.success();
         }
-        return RestResponse.success(globalSets, ApiConstants.RESULT_SUCCESS, "查询成功");
+        return RestResponse.success(globalSets, "成功");
     }
 
     /**
@@ -51,14 +53,12 @@ public class GlobalSetController {
      * @description 根据id更新维保公司的全局设置
      * @date 2019/12/13 16:24
      */
-    @PostMapping("/update")
-    public RestResponse update(@RequestBody List<GlobalSet> globalSets) {
-        globalSets.forEach(globalSet -> {
-            globalSet.setUpdateTime(LocalDateTime.now(Clock.system(ZoneId.of("Asia/Shanghai"))));
-        });
-        if (globalSetService.updateBatchById(globalSets)) {
-            return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "更新成功");
+    @PostMapping("/modify")
+    public RestResponse modify(@RequestBody List<GlobalSet> globalSets) {
+        globalSets.forEach(globalSet -> globalSet.setUpdateTime(LocalDateTime.now()));
+        if (globalSetService.saveOrUpdateBatch(globalSets)) {
+            return RestResponse.success(null, "成功");
         }
-        return RestResponse.success(null, ApiConstants.RESULT_NO_DATA, "无数据");
+        return RestResponse.success();
     }
 }