功能提交 ，修改加款之后的数据类型为Long ,之前为 integer

common/fire-dto/src/main/java/com/fire/dto/enums/Status.java

@@ -32,6 +32,7 @@ public enum Status {
     PRODUCT_MAINTAIN("205", "产品维护"),
     BALANCE_NOT_ENOUGH("301", "可用余额不足"),
     RECORDING_EXISTS("410", "记录已经存在"),
+    REQUEST_PARAM_ERROR("411","请求参数不合法"),
     PARAM_ERROR("306", "参数不合法");
 
     private final String status;

modules/admin/src/main/java/com/fire/admin/rest/TestController.java

@@ -46,8 +46,17 @@ public class TestController {
 
 
     public static void main(String[] args) {
-        int i = new BigDecimal("9.9000").multiply(new BigDecimal(10000)).intValue();
-        System.out.println("anInt = " + i);
+       Integer a=5;
+
+       Long l=5L;
+
+       if(a.longValue()==l.longValue()){
+           System.out.println(" = ============");
+       }else {
+           System.out.println(" heehee");
+
+       }
+
     }
 
 }

modules/admin/src/main/java/com/fire/admin/service/ChannelGroupService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fire.admin.request.ChannelGroupPageParam;
 import com.fire.dto.ChannelGroup;
 
+import java.util.List;
+
 /**
  * @author: admin
  * @Description:
@@ -20,4 +22,14 @@ public interface ChannelGroupService extends IService<ChannelGroup> {
     void updateChannelGroupById(ChannelGroup channelGroup);
 
     void deleteChannelGroupById(Long channelGroupId);
+
+
+    /**
+    * @Description:  TODO 根据通道组的集合获取通道组id 和通道组名称，用与app  接入展示
+    * @Param: [channelGroupIds]
+    * @return: java.util.List<com.fire.dto.ChannelGroup>
+    * @Author: liuliu
+    * @Date: 2021/6/7 17:58
+    */
+    List<ChannelGroup> queryChannelGroup(List<Long> channelGroupIds);
 }

modules/admin/src/main/java/com/fire/admin/service/impl/AdditionalPaymentServiceImpl.java

@@ -59,7 +59,7 @@ public class AdditionalPaymentServiceImpl extends ServiceImpl<AdditionalPaymentM
             int count = this.additionalPayment(additionalPaymentDto);
             if (count > 0) {
                 // TODO 加款成功之后，把加款的金额写入数据库
-                //redisAmountScript.changeAmount(CUSTOMER_AMOUNT.key(), Long.getLong(additionalPaymentDto.getRelationId()), "add", additionalPaymentDto.getAmount().multiply(new BigDecimal(10000)), 0L);
+                redisAmountScript.changeAmount(CUSTOMER_AMOUNT.key(), Long.getLong(additionalPaymentDto.getRelationId()), "add", additionalPaymentDto.getAmount().multiply(new BigDecimal(10000)).longValue(), 0L);
             }
         } else if (additionalPaymentDto.getType().equals("suppler")) {
             additionalPaymentDto.setDistinguish(1);

modules/admin/src/main/java/com/fire/admin/service/impl/ChannelGroupServiceImpl.java

@@ -6,9 +6,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fire.admin.mapper.ChannelGroupMapper;
 import com.fire.admin.request.ChannelGroupPageParam;
 import com.fire.admin.service.ChannelGroupService;
+import com.fire.common.exception.BaseException;
 import com.fire.dto.ChannelGroup;
+import com.fire.dto.enums.Status;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author: admin
  * @Description:
@@ -52,4 +56,25 @@ public class ChannelGroupServiceImpl extends ServiceImpl<ChannelGroupMapper, Cha
             // TODO: 2021/6/3 向MQ推送消息
         }
     }
+
+    /**
+     * @Description:  TODO 根据通道组的集合获取通道组id 和通道组名称，用与app  接入展示
+     * @Param: [channelGroupIds]
+     * @return: java.util.List<com.fire.dto.ChannelGroup>
+     * @Author: liuliu
+     * @Date: 2021/6/7 17:58
+     */
+    @Override
+    public List<ChannelGroup> queryChannelGroup(List<Long> channelGroupIds) {
+        if(!channelGroupIds.isEmpty()){
+            LambdaQueryWrapper<ChannelGroup> wrapper = new LambdaQueryWrapper<>();
+            wrapper.select(ChannelGroup::getChannelGroupId,ChannelGroup::getGroupName)
+                    .in(ChannelGroup::getChannelGroupId,channelGroupIds);
+            return  baseMapper.selectList(wrapper);
+        }else {
+            // TODO 抛出请求参数不合法的异常
+            throw new BaseException(Status.REQUEST_PARAM_ERROR.status(),Status.REQUEST_PARAM_ERROR.message());
+        }
+
+    }
 }

modules/admin/src/main/java/com/fire/admin/service/impl/CustomerProductInfoServiceImpl.java

@@ -96,7 +96,6 @@ public class CustomerProductInfoServiceImpl extends ServiceImpl<CustomerProductI
                         .facePrice(Long.parseLong(String.valueOf(dto.getFacePrice().multiply(new BigDecimal(10000)))))
                         .isEffective(dto.getIsEffective())
                         .disCount(dto.getPrice().divide(dto.getFacePrice())).build();
-                log.info("产品为：【{}】",product.toString());
                 productList.add(product);
             });
 

modules/admin/src/main/java/com/fire/admin/service/impl/FlowAppInfoServiceImpl.java

@@ -1,16 +1,25 @@
 package com.fire.admin.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fire.admin.dto.FlowAppInfoDto;
 import com.fire.admin.mapper.FlowAppMapper;
+import com.fire.admin.service.ChannelGroupService;
 import com.fire.admin.service.FlowAppInfoService;
 import com.fire.admin.vo.FlowAppInfoVo;
+import com.fire.dto.ChannelGroup;
 import com.fire.dto.FlowAppInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @author: liuliu
  * @ClassName: FlowAppInfoServiceImpl
@@ -22,6 +31,14 @@ import org.springframework.stereotype.Service;
 public class FlowAppInfoServiceImpl extends ServiceImpl<FlowAppMapper, FlowAppInfo> implements FlowAppInfoService {
 
 
+
+    private ChannelGroupService channelGroupService;
+
+    @Autowired
+    public  FlowAppInfoServiceImpl(ChannelGroupService channelGroupService){
+        this.channelGroupService=channelGroupService;
+    }
+
     /**
      * @Description: TODO 分页获取客户接入对象
      * @Param: 客户名称
@@ -31,16 +48,37 @@ public class FlowAppInfoServiceImpl extends ServiceImpl<FlowAppMapper, FlowAppIn
      */
     @Override
     public IPage<FlowAppInfoVo> getFlowAppInfoPage(Page page, String customerName) {
-        return baseMapper.queryFlowAppInfoPage(page, customerName);
+
+
+        IPage<FlowAppInfoVo> flowAppInfoVoIPage = baseMapper.queryFlowAppInfoPage(page, customerName);
+
+        // TODO  元数据
+        List<FlowAppInfoVo> flowAppInfoVoList= flowAppInfoVoIPage.getRecords();
+
+        List<Long> channelGroupIds = JSONArray.parseArray(flowAppInfoVoList.stream().map(FlowAppInfoVo::getChannelId).collect(Collectors.toList()).toString(), Long.class);
+
+        List<ChannelGroup> channelGroups = channelGroupService.queryChannelGroup(channelGroupIds);
+
+        flowAppInfoVoList.forEach(app->{
+            channelGroups.forEach(channel->{
+                if(ObjectUtil.isNotEmpty(app.getChannelId()) && ObjectUtil.isNotEmpty(channel.getChannelGroupId())){
+                    if(app.getChannelId().longValue() == channel.getChannelGroupId().longValue()){
+                        app.setGroupName(channel.getGroupName());
+                    }
+                }
+            });
+        });
+
+        return flowAppInfoVoIPage;
     }
 
     /**
-    * @Description:  TODO 修改客户接入信息
-    * @Param:  客户接入网络传输对象
-    * @return: void
-    * @Author: liuliu
-    * @Date: 2021/5/26 10:16
-    */
+     * @Description: TODO 修改客户接入信息
+     * @Param: 客户接入网络传输对象
+     * @return: void
+     * @Author: liuliu
+     * @Date: 2021/5/26 10:16
+     */
     @Override
     public void updateFlowAppInfo(FlowAppInfoDto flowAppInfoDto) {
         FlowAppInfo appInfo = FlowAppInfo.builder()
@@ -56,8 +94,8 @@ public class FlowAppInfoServiceImpl extends ServiceImpl<FlowAppMapper, FlowAppIn
                 .time(flowAppInfoDto.getTime())
                 .channelId(flowAppInfoDto.getChannelId()).build();
         int count = baseMapper.updateById(appInfo);
-        if(count>0){
-            log.info("客户接入信息修改，修改信息为：【{}】",appInfo.toString());
+        if (count > 0) {
+            log.info("客户接入信息修改，修改信息为：【{}】", appInfo.toString());
             // TODO 发送消息到 客户接入 topic
 
         }

modules/admin/src/main/java/com/fire/admin/vo/FlowAppInfoVo.java

@@ -1,11 +1,14 @@
 package com.fire.admin.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @author: liuliu
@@ -15,6 +18,8 @@ import lombok.Data;
  */
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class FlowAppInfoVo {
 
     @ApiModelProperty(value = "接入ID号")
@@ -59,4 +64,6 @@ public class FlowAppInfoVo {
     @ApiModelProperty(value = "通道ID(关联的通道组id)")
     private  Integer channelId;
 
+    @ApiModelProperty(value = "通道组名称")
+    private String groupName;
 }

modules/admin/src/main/resources/mapper/FlowAppInfoMapper.xml

@@ -22,7 +22,7 @@
 
 
     <resultMap id="ResultMap" type="com.fire.admin.vo.FlowAppInfoVo">
-        <id column="flow_app_id" property="flowAppId"/>
+        <result column="flow_app_id" property="flowAppId"/>
         <result column="customer_name" property="customerName"/>
         <result column="app_id" property="appId"/>
         <result column="app_key" property="appKey"/>