Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -205,11 +205,11 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     EMAIL_TENANT_RECHARGE("EMAIL_TENANT_RECHARGE",   "云教室充值"),
     EMAIL_TENANT_INSUFFICIENT_BALANCE("EMAIL_TENANT_INSUFFICIENT_BALANCE",  "余额不足"),
 
-    SMS_TENANT_ACTIVATION_SUCCESSFUL("EMAIL_TENANT_ACTIVATION_SUCCESSFUL",   "开通成功"),
-    SMS_TENANT_RENEWAL_SUCCESSFUL("EMAIL_TENANT_RENEWAL_SUCCESSFUL", "续费成功"),
-    SMS_TENANT_EXPIRATION_REMINDERS("EMAIL_TENANT_EXPIRATION_REMINDERS",   "服务即将到期"),
+    SMS_TENANT_ACTIVATION_SUCCESSFUL("SMS_TENANT_ACTIVATION_SUCCESSFUL",   "开通成功"),
+    SMS_TENANT_RENEWAL_SUCCESSFUL("SMS_TENANT_RENEWAL_SUCCESSFUL", "续费成功"),
+    SMS_TENANT_EXPIRATION_REMINDERS("SMS_TENANT_EXPIRATION_REMINDERS",   "服务即将到期"),
     SMS_TENANT_RECHARGE("SMS_TENANT_RECHARGE",   "云教室充值"),
-    SMS_TENANT_INSUFFICIENT_BALANCE("EMAIL_TENANT_INSUFFICIENT_BALANCE",  "余额不足"),
+    SMS_TENANT_INSUFFICIENT_BALANCE("SMS_TENANT_INSUFFICIENT_BALANCE",  "余额不足"),
     ;
 
     MessageTypeEnum(String code, String msg) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -309,12 +309,13 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	@Async
 	public void batchSendMessage(Integer senderTenantId, MessageSender messageSender, MessageTypeEnum type, Map<Integer, String> receivers, Date triggerTime, Integer readStatus,
 			String url,String jpushType, Object... args) {
-		LOGGER.info("batchSendMessage {}, type {}, receivers {} ", messageSender, type, receivers);
+		LOGGER.info("batchSendMessage tenantId {} msgSender {}, type {}, receivers {} ", senderTenantId, messageSender, type, receivers);
 		if (receivers == null || receivers.size() == 0) {
 			LOGGER.error("接收地址不能为空");
 			return;
 		}
-		SimpleUserDto simpleUserDto = teacherDao.getSimpleUser(receivers.keySet().iterator().next());
+		Integer userId = receivers.keySet().iterator().next();
+		SimpleUserDto simpleUserDto = teacherDao.getSimpleUser(userId);
 		Integer receiverTenantId = simpleUserDto.getTenantId();
 
 		// email data from database load, 使用接收者 tenantId, 假设发送者和接收者为同一机构
@@ -349,6 +350,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			}
 		}
 		String[] tos = receivers.values().toArray(new String[receivers.size()]);
+		LOGGER.error("batch 接收人 {} ", tos  );
 		SysMessageConfig messageConfig = sysMessageConfigService.queryByType(type);
 		if (messageConfig == null) {
 			throw new BizException("消息类型错误");

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoSendMsgServiceImpl.java

@@ -48,12 +48,13 @@ public class TenantInfoSendMsgServiceImpl implements TenantInfoSendMsgService {
      */
     @Override
     public void platformSendToAll(Integer receiveUserId, String email, String phone, Object[] objs) {
-        Map<Integer, String> sendPar = new HashMap<>();
+
         if (Objects.isNull(receiveUserId)) {
             return;
         }
 
         if (StringUtils.isNotBlank(email)) {
+            Map<Integer, String> sendPar = new HashMap<>();
             sendPar.put(receiveUserId, email);
             log.info("platformSendToAll>>> receiveUserId {} email {} objs {} sendPar {}", receiveUserId, email, objs, sendPar);
             sysMessageService.batchSendMessage(-1, MessageSenderPluginContext.MessageSender.EMAIL,
@@ -63,11 +64,12 @@ public class TenantInfoSendMsgServiceImpl implements TenantInfoSendMsgService {
         }
 
         if (StringUtils.isNotBlank(phone)) {
-            sendPar.put(receiveUserId, phone);
-            log.info("platformSendToAll>>> receiveUserId {} phone {} objs {} sendPar {}", receiveUserId, phone, objs, sendPar);
+            Map<Integer, String> sendPar2 = new HashMap<>();
+            sendPar2.put(receiveUserId, phone);
+            log.info("platformSendToAll>>> receiveUserId {} phone {} objs {} sendPar {}", receiveUserId, phone, objs, sendPar2);
             sysMessageService.batchSendMessage(-1, MessageSenderPluginContext.MessageSender.AWSMS,
                     PLATFORM_ALL_MSG_ENUM.get(MessageSenderPluginContext.MessageSender.AWSMS),
-                    sendPar, null, 0, null,
+                    sendPar2, null, 0, null,
                     "SYSTEM", objs);
         }
     }

mec-web/src/main/resources/columnMapper.ini

@@ -4,20 +4,15 @@
 商品名称 = name
 商品类型 = type
 商品分类 = goodsCategoryName
-具体型号 = specification
+商品型号 = specification
+库存类型 = stockType
+是否库存预警 = stockWarning
 商品市场价(元) = marketPrice
-商品零售价 = discountPrice
-商品团购价(元) = groupPurchasePrice
-商品采购价1(元) = costPrice
+零售价(元) = discountPrice
+团购价(元) = groupPurchasePrice
 商品图片(插入一张图片) = image
-商品明细 = brief
-商品采购价2(元) = agreeCostPrice
-内部库存 = stockCount
-税务库存 = taxStockCount
-备查货号 = supplyChannel
-库存类型 = stockType
+商品描述 = brief
 商品详情 = desc
-库存预警 = stockWarning
 
 
 [财务支出导入模板]

mec-web/src/main/resources/columnMapper_修改商品导入.ini

@@ -0,0 +1,54 @@
+[商品导入模板]
+品牌 = brand
+货号 = sn
+商品名称 = name
+商品类型 = type
+商品分类 = goodsCategoryName
+具体型号 = specification
+商品市场价(元) = marketPrice
+商品零售价 = discountPrice
+商品团购价(元) = groupPurchasePrice
+商品采购价1(元) = costPrice
+商品图片(插入一张图片) = image
+商品明细 = brief
+商品采购价2(元) = agreeCostPrice
+内部库存 = stockCount
+税务库存 = taxStockCount
+备查货号 = supplyChannel
+库存类型 = stockType
+商品详情 = desc
+库存预警 = stockWarning
+
+
+[财务支出导入模板]
+财务流程编号 = financialProcessNo
+钉钉流程编号 = dingtalkProcessNo
+费用归属分部 = organName
+费用归属学校 = cooperationOrganName
+申请人 = applyUser
+费用类型 = type
+费用项目 = feeProject
+付款金额 = amount
+备注 = itemDetail
+付款时间 = paymentTime
+事由 = cause
+
+
+[财务管理导入模板]
+收入类型 = incomeType
+所属分部 = organName
+所属学校 = cooperationOrganName
+学员编号 = userId
+交易流水号 = transNo
+收款账户 = merNo
+交易日期 = payTime
+销售金额 = saleAmount
+服务金额 = serviceAmount
+商品编号 = goodsIds
+商品数量 = goodsNums
+备注 = memo
+缴费单号 = calenderId
+
+[兑换码分配模板表]
+代码 = code
+链接地址 = url