bugfix-会员记录订制服务回显

src/main/java/com/caimei/controller/vip/VipApi.java

@@ -60,7 +60,7 @@ public class VipApi {
     @ApiImplicitParams({
             @ApiImplicitParam(required = false, name = "authUserId", value = "用户id"),
             @ApiImplicitParam(required = false, name = "packageId", value = "会员套餐id"),
-            @ApiImplicitParam(required = false, name = "services", value = "订制服务,以,分开")
+            @ApiImplicitParam(required = false, name = "services", value = "订制服务id,以,分开")
     })
     @GetMapping("/pay")
     public ResponseJson<Integer> payVip(Integer authUserId, Integer packageId, String services) {

src/main/java/com/caimei/mapper/VipMapper.java

@@ -57,4 +57,6 @@ public interface VipMapper {
     List<SysMenu> getBaseMenuList();
 
     List<SysMenu> getUpMenuList();
+
+    String getVipServiceName(String serviceId);
 }

src/main/java/com/caimei/service/vip/impl/VipServiceImpl.java

@@ -13,6 +13,7 @@ import com.caimei.service.vip.VipService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -36,8 +37,6 @@ public class VipServiceImpl implements VipService {
     private SysMenuService sysMenuService;
     @Resource
     private SysUserService sysUserService;
-    @Resource
-    private SysRoleService sysRoleService;
 
     @Override
     public ResponseJson<Integer> payVip(Integer authUserId, Integer packageId, String services, Integer payWay, Integer payStatus, Date payTime) {
@@ -83,7 +82,15 @@ public class VipServiceImpl implements VipService {
         vipHistory.setPayStatus(payStatus);
         vipHistory.setPayWay(payWay);
         vipHistory.setPrice(packageVo.getPrice());
-        vipHistory.setServices(services);
+        String[] serviceIdArr = services.split(",");
+        String serviceNames = "";
+        for (String serviceId : serviceIdArr) {
+            String serviceName = vipMapper.getVipServiceName(serviceId);
+            if (StringUtils.isNotEmpty(serviceName)) {
+                serviceNames += "".equals(serviceNames) ? serviceName : "," + serviceName;
+            }
+        }
+        vipHistory.setServices(serviceNames);
         vipHistory.setPayTime(payTime);
         if (null != dbHistoryId) {
             vipHistory.setId(dbHistoryId);
@@ -220,8 +227,6 @@ public class VipServiceImpl implements VipService {
     public ResponseJson vipMenusConfigure(List<Map<String, Object>> baseMenuList, List<Map<String, Object>> upMenuList) {
         systemMapper.deleteRoleMenuRelation(1);
         systemMapper.deleteRolePermissionRelation(1);
-        systemMapper.deleteRoleMenuRelation(2);
-        systemMapper.deleteRolePermissionRelation(2);
         Set<Integer> baseMenuIdSet = new HashSet<>();
         Set<Integer> basePermissionIdSet = new HashSet<>();
         for (Map<String,Object> menu : baseMenuList) {

src/main/resources/config/beta/application-beta.yml

@@ -51,6 +51,8 @@ logging:
     path: /mnt/newdatadrive/data/runtime/jar-instance/zplma/logs
   level:
     root: info
+    com.caimei.mapper: debug
+    com.caimei.module.product.dao: debug
 
 # swagger文档显示配置
 swagger:

src/main/resources/mapper/VipMapper.xml

@@ -96,7 +96,8 @@
     <select id="getVipHistoryList" resultType="com.caimei.model.vo.VipHistoryListVo">
         select id as historyId,duration,price,
         if(payWay=2,1,(case payType when 14 then 2
-        when 13 or 15 then 3
+        when 13 then 3
+        when 15 then 3
         when 12 then 4
         when 17 then 5
         end )) as payWay,
@@ -170,4 +171,7 @@
           and m.base_flag = 0
           and m.parent_id = 0
     </select>
+    <select id="getVipServiceName" resultType="java.lang.String">
+        select name from auth_vip_service where id = #{serviceId}
+    </select>
 </mapper>