训练营导出添加分组名称

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/controller/kxsapp/UserOrderController.java

@@ -40,6 +40,18 @@ public class UserOrderController {
         return kxsMachineApplyService.applyMachine(param);
     }
 
+    /**
+     * 订单管理-申请机具
+     *
+     * @param param 实体对象
+     * @return 订单管理-申请机具
+     */
+    @PostMapping("/applyVhostGdSn")
+    public R applyVhostGdSn(@Valid @RequestBody ApplyMachineDTO param) {
+
+        return kxsMachineApplyService.applyVhostGdSn(param);
+    }
+
     /**
      * 机具申请-申请记录
      *

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/KxsMachineApplyService.java

@@ -29,6 +29,15 @@ public interface KxsMachineApplyService extends IService<KxsMachineApply> {
      */
     R applyMachine(ApplyMachineDTO param);
 
+    /**
+     * 申请广电虚拟sn
+     *
+     * @param param 参数
+     * @return {@link R}
+     */
+    R applyVhostGdSn(ApplyMachineDTO param);
+
+
     /**
      * 订单管理-划拨
      *
@@ -77,5 +86,6 @@ public interface KxsMachineApplyService extends IService<KxsMachineApply> {
      * @return {@link UserApplyMachineDetailVO}
      */
     UserApplyMachineDetailVO userApplyMachineDetail(Long id);
+
 }
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineApplyServiceImpl.java

@@ -274,6 +274,27 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
         return R.ok();
     }
 
+    @Override
+    public R applyVhostGdSn(ApplyMachineDTO param) {
+        Long userId = SecurityUtils.getUser().getId();
+        //订单号
+        Snowflake snowflake = IdUtil.getSnowflake(1, userId);
+        long orderSn = snowflake.nextId();
+
+        KxsMachineApply order = new KxsMachineApply();
+        BeanUtils.copyProperties(param, order);
+        order.setOrderSn("BA" + orderSn);
+        //查询申请用户
+        R<KxsUser> userResult = remoteKxsUserService.loadUserById(userId.intValue(), SecurityConstants.FROM_IN);
+        KxsUser user = RetOps.of(userResult)
+                .getData()
+                .orElseThrow(() -> new GlobalCustomerException(StoreErrorTypeEnum.SN_FIND_NULL.getDescription()));
+        order.setUserId(userId.intValue());
+        order.setUsername(user.getUsername());
+        order.setUserCode(user.getUserCode());
+        return null;
+    }
+
     @Override
     @GlobalTransactional
     @Transactional(rollbackFor = Exception.class)

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsCampBonusLogMapper.xml

@@ -50,7 +50,7 @@
     </select>
     <select id="exportLog" resultType="com.kxs.system.api.vo.admin.camp.CampBonusLogVO">
         SELECT cbl.id, cbl.source_num, cbl.username as sourceName, cbl.source_id, cbl.user_code as sourceCode, cbl.source_type, cbl.remark, cbl.create_time, cbl.group_id, cbl.kind,
-        cu.username, cu.user_code, cg.group_name
+        cu.username, cu.user_code, cg.group_name,
         c.title
         FROM  kxs_camp_bonus_log cbl
         LEFT JOIN kxs_camp_user cu ON cbl.camp_user_id = cu.user_id AND cu.camp_id = #{param.campId}