* 功能优化

src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketMoneyController.java

@@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
-    * 红包金额设置  前端控制器
-    * </p>
+ * 红包金额设置  前端控制器
+ * </p>
  *
  * @author fxf
  * @since 2020-06-03
@@ -32,25 +32,26 @@ public class TaRedPacketMoneyController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taRedPacketMoney",method= RequestMethod.GET)
-    public ResponseBean taRedPacketMoneyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/taRedPacketMoney", method = RequestMethod.GET)
+    public ResponseBean taRedPacketMoneyList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaRedPacketMoney> pg = new Page<>(pageNum, pageSize);
+            IPage<TaRedPacketMoney> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaRedPacketMoney> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaRedPacketMoney> result = iTaRedPacketMoneyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketMoneyList -=- {}",e.toString());
+            logger.error("taRedPacketMoneyList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,21 +59,22 @@ public class TaRedPacketMoneyController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taRedPacketMoney 实体对象
      * @return
      */
-    @RequestMapping(value="/taRedPacketMoney",method= RequestMethod.POST)
-    public ResponseBean taRedPacketMoneyAdd(@RequestBody TaRedPacketMoney taRedPacketMoney){
+    @RequestMapping(value = "/taRedPacketMoney", method = RequestMethod.POST)
+    public ResponseBean taRedPacketMoneyAdd(@RequestBody TaRedPacketMoney taRedPacketMoney) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaRedPacketMoneyService.save(taRedPacketMoney)){
+            if (iTaRedPacketMoneyService.save(taRedPacketMoney)) {
                 responseBean.addSuccess(taRedPacketMoney);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketMoneyAdd -=- {}",e.toString());
+            logger.error("taRedPacketMoneyAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -80,21 +82,22 @@ public class TaRedPacketMoneyController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taRedPacketMoney/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taRedPacketMoneyDelete(@PathVariable String id){
+    @RequestMapping(value = "/taRedPacketMoney/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taRedPacketMoneyDelete(@PathVariable String id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaRedPacketMoneyService.removeById(id)){
+            if (iTaRedPacketMoneyService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketMoneyDelete -=- {}",e.toString());
+            logger.error("taRedPacketMoneyDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -102,18 +105,20 @@ public class TaRedPacketMoneyController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id               实体ID
      * @param taRedPacketMoney 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/redPacket/money/{id}",method= RequestMethod.PUT)
-    public ResponseBean taRedPacketMoneyUpdate(@RequestBody TaRedPacketMoney taRedPacketMoney){
+    @RequestMapping(value = "/admin/redPacket/money/{id}", method = RequestMethod.PUT)
+    public ResponseBean taRedPacketMoneyUpdate(@PathVariable("id") String id, @RequestBody TaRedPacketMoney taRedPacketMoney) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            taRedPacketMoney.setActivityId(id);
             responseBean = iTaRedPacketMoneyService.updateRedPacketMoney(taRedPacketMoney);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketMoneyUpdate -=- {}",e.toString());
+            logger.error("taRedPacketMoneyUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -121,16 +126,17 @@ public class TaRedPacketMoneyController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/admin/redPacket/money/{id}",method= RequestMethod.GET)
-    public ResponseBean taRedPacketMoneyGet(@PathVariable String id){
+    @RequestMapping(value = "/admin/redPacket/money/{id}", method = RequestMethod.GET)
+    public ResponseBean taRedPacketMoneyGet(@PathVariable String id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaRedPacketMoneyService.getRedPacketMoneyById(id);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketMoneyDelete -=- {}",e.toString());
+            logger.error("taRedPacketMoneyDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

src/main/java/com/huiju/estateagents/redpack/entity/TaRedPacketMoney.java

@@ -66,8 +66,26 @@ public class TaRedPacketMoney implements Serializable {
     private String insufficientBalanceTip;
 
     /**
-     * 红包客户端消息通知
+     * 商户名称
      */
     @TableField(exist = false)
-    private TaRedPacketClient taRedPacketClient;
+    private String mchName;
+
+    /**
+     * 红包祝福语
+     */
+    @TableField(exist = false)
+    private String blessing;
+
+    /**
+     * 活动名称
+     */
+    @TableField(exist = false)
+    private String activityName;
+
+    /**
+     * 备注
+     */
+    @TableField(exist = false)
+    private String remark;
 }

src/main/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketMoneyServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.redpack.service.impl;
 
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.redpack.entity.TaRedPacketClient;
 import com.huiju.estateagents.redpack.entity.TaRedPacketMoney;
 import com.huiju.estateagents.redpack.mapper.TaRedPacketMoneyMapper;
@@ -37,7 +38,12 @@ public class TaRedPacketMoneyServiceImpl extends ServiceImpl<TaRedPacketMoneyMap
 
         // 获取红包客户端消息配置
         TaRedPacketClient taRedPacketClient = iTaRedPacketClientService.getById(activityId);
-        taRedPacketMoney.setTaRedPacketClient(taRedPacketClient);
+        if (taRedPacketClient != null) {
+            taRedPacketMoney.setMchName(taRedPacketClient.getMchName());
+            taRedPacketMoney.setActivityName(taRedPacketClient.getActivityName());
+            taRedPacketMoney.setBlessing(taRedPacketClient.getBlessing());
+            taRedPacketMoney.setRemark(taRedPacketClient.getRemark());
+        }
         responseBean.addSuccess(taRedPacketMoney);
         return responseBean;
     }
@@ -49,9 +55,17 @@ public class TaRedPacketMoneyServiceImpl extends ServiceImpl<TaRedPacketMoneyMap
         // 更新红包金额设置
         updateById(taRedPacketMoney);
         // 更新红包客户端消息配置
-        if (null != taRedPacketMoney.getTaRedPacketClient()) {
-            iTaRedPacketClientService.updateById(taRedPacketMoney.getTaRedPacketClient());
+        if (!StringUtils.isEmpty(taRedPacketMoney.getActivityName()) || !StringUtils.isEmpty(taRedPacketMoney.getMchName())
+                || !StringUtils.isEmpty(taRedPacketMoney.getBlessing()) || !StringUtils.isEmpty(taRedPacketMoney.getRemark())){
+            TaRedPacketClient taRedPacketClient = new TaRedPacketClient();
+            taRedPacketClient.setActivityId(taRedPacketMoney.getActivityId());
+            taRedPacketClient.setMchName(taRedPacketMoney.getMchName());
+            taRedPacketClient.setActivityName(taRedPacketMoney.getActivityName());
+            taRedPacketClient.setBlessing(taRedPacketMoney.getBlessing());
+            taRedPacketClient.setRemark(taRedPacketMoney.getRemark());
+            iTaRedPacketClientService.updateById(taRedPacketClient);
         }
+
         responseBean.addSuccess("success");
         return responseBean;
     }