Merge branch 'develop' of kxs-end/api-server into test-user

职级预设记录

kxs-common/kxs-common-core/src/main/resources/logback-spring.xml

@@ -63,10 +63,28 @@
 		</filter>
 	</appender>
 
+
 	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-	<root level="INFO">
-		<appender-ref ref="console"/>
-		<appender-ref ref="debug"/>
-		<appender-ref ref="error"/>
-	</root>
+
+	<springProfile name="dev">
+		<root level="INFO">
+			<appender-ref ref="console"/>
+			<appender-ref ref="debug"/>
+			<appender-ref ref="error"/>
+		</root>
+	</springProfile>
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="console"/>
+			<appender-ref ref="debug"/>
+			<appender-ref ref="error"/>
+		</root>
+	</springProfile>
+	<springProfile name="prod">
+		<root level="ERROR">
+			<appender-ref ref="console"/>
+			<appender-ref ref="debug"/>
+			<appender-ref ref="error"/>
+		</root>
+	</springProfile>
 </configuration>

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/excel/MachineDeductExcelVo.java

@@ -24,13 +24,6 @@ public class MachineDeductExcelVo implements Serializable {
 	@ExcelIgnore
 	private Long lineNum;
 
-	/**
-	 * 机具号
-	 */
-	@NotBlank(message = "产品类型不能为空")
-	@ExcelProperty("产品类型")
-	private String brandName;
-
 	/**
 	 * SN编号
 	 */

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/constant/enums/ProductErrorTypeEnum.java

@@ -24,6 +24,7 @@ public enum ProductErrorTypeEnum {
 	TICKET_NOT_USER(-1, "券码不属于该创客"),
 	MACHINE_NOT_USER(-1, "机具不属于该创客"),
 	BRAND_EMPTY(-1, "产品未找到"),
+	IMPORT_EMPTY(-1, "导入数据为空"),
 	MACHINE_TRANSFER_NO(-1, "循环机不可划拨");
 
 	private final int code;

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineDeductServiceImpl.java

@@ -35,12 +35,16 @@ public class KxsMachineDeductServiceImpl extends ServiceImpl<KxsMachineDeductMap
 
     @Override
     public R importData(List<MachineDeductExcelVo> machineDeductExcelVos, BindingResult bindingResult) {
+
+        if (machineDeductExcelVos.isEmpty()) {
+            return R.failed(ProductErrorTypeEnum.IMPORT_EMPTY.getDescription());
+        }
         //查询所有品牌
         List<KxsBrand> brands = kxsBrandMapper.selectList(Wrappers.emptyWrapper());
 
         // 通用校验获取失败的数据
         List<ErrorMessage> errorMessageList = (List<ErrorMessage>) bindingResult.getTarget();
-        // 执行数据插入操作 组装 PostDto
+        // 执行数据插入操作
         for (MachineDeductExcelVo excel : machineDeductExcelVos) {
             Set<String> errorMsg = new HashSet<>();
             KxsMachineDeduct machineDeduct = new KxsMachineDeduct();
@@ -51,13 +55,13 @@ public class KxsMachineDeductServiceImpl extends ServiceImpl<KxsMachineDeductMap
                 errorMsg.add(excel.getPosSn() + "已存在，请重新上传！");
             }
             //查询品牌
-            KxsBrand brand = brands.stream().filter(b -> b.getName().equals(excel.getBrandName())).findFirst().orElse(null);
-            // 数据不合法
-            if(brand == null){
-                errorMsg.add(ProductErrorTypeEnum.BRAND_EMPTY.getDescription());
-            }else{
-                machineDeduct.setBrandId(brand.getId());
-            }
+//            KxsBrand brand = brands.stream().filter(b -> b.getName().equals(excel.getBrandName())).findFirst().orElse(null);
+//            // 数据不合法
+//            if(brand == null){
+//                errorMsg.add(ProductErrorTypeEnum.BRAND_EMPTY.getDescription());
+//            }else{
+//                machineDeduct.setBrandId(brand.getId());
+//            }
             // 数据合法情况
             if (CollUtil.isEmpty(errorMsg)) {
                 this.save(machineDeduct);

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/mapper/old/TradeDaySummaryMapper.java

@@ -25,4 +25,5 @@ public interface TradeDaySummaryMapper extends BaseMapper<TradeDaySummary> {
      * @return {@link AmountDetailVO}
      */
     AmountDetailVO currentMonthsTotal(@Param("userId") Long userId, @Param("queryMonth") String queryMonth);
+
 }

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsUserPresetLogMapper.xml

@@ -18,7 +18,7 @@
     <select id="logList" resultType="com.kxs.user.api.vo.kxsapp.userPresetLevel.UserPresetLogVO">
         select u.id, a.end_time, a.preset_level, u.username, u.avatar from kxs_user_preset_log a
                  left join kxs_user u on u.id = a.user_id
-                 where a.user_id = #{userId}
+                 where a.create_by_id = #{userId}
                  <if test="keyword != null and keyword != ''">
                      and u.user_code = #{keyword}
                  </if>