Merge branch 'developer' into 'master'

Developer

See merge request !22

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/EnterpriseListDTO.java

@@ -3,9 +3,11 @@ package com.gic.enterprise.dto;
 import com.gic.enterprise.constant.LicenseTypeEnum;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author guojx
@@ -155,7 +157,19 @@ public class EnterpriseListDTO implements Serializable{
         if (licenseUpperLimitStr == null || licenseUpperLimitStr == "") {
             return "--";
         } else {
-            return licenseUpperLimitStr;
+            //按照会员卡、服务号、小程序、门店分别展示
+            //数据格式 名称:数值-名称2:数值2
+            Map<String, Object> map = Arrays.stream(licenseUpperLimitStr.split("-"))
+                    .map(e -> e.split(":"))
+                    .collect(Collectors.toMap(e -> e[0], e -> e[1]));
+            Object memberCard = map.get("会员卡");
+            Object serviceCard = map.get("服务号");
+            Object weChat = map.get("小程序");
+            Object store = map.get("门店");
+            return (memberCard == null ? "0" : memberCard.toString()) + "-"
+                    + (serviceCard == null ? "0" : serviceCard.toString()) + "-"
+                    + (weChat == null ? "0" : weChat.toString()) + "-"
+                    + (store == null ? "0" : store.toString());
         }
     }
 

gic-platform-enterprise-service/src/main/resources/mapper/TabEnterpriseMapper.xml

@@ -283,7 +283,7 @@
     a.company_name companyName,
     a.create_time createTime,
     a.is_init_complete isInitComplete,
-    GROUP_CONCAT(b.upper_limit ORDER BY b.enterprise_license_id separator '-') licenseUpperLimitStr,
+    GROUP_CONCAT(concat(b.license_name,':',b.upper_limit) separator '-') licenseUpperLimitStr,
     a.version_code versionCode,
     a.version_name versionName,
     a.audit_time expirationTime,

gic-platform-enterprise-service/src/main/resources/mapper/TabWmStoreCouponConfigMapper.xml

@@ -167,7 +167,7 @@
     select <include refid="Base_Column_List"></include>
     from tab_wm_store_coupon_config
 
-    where 1 = 1
+    where status = 1
     <if test="wmMallStoreId != null and wmMallStoreId != '' ">
       and wm_mall_store_id = #{wmMallStoreId}
     </if>
@@ -185,7 +185,6 @@
     </if>
     <if test="onlyShowEffective != null and onlyShowEffective == 1">
       and (gic_coupon_expire is null or TIMESTAMPDIFF(DAY, now(), gic_coupon_expire) >= 0)
-      and status = 1
     </if>
     <if test="couponName != null and couponName != '' ">
       and (gic_coupon_name like concat('%', #{couponName}, '%') or wm_coupon_name like concat('%', #{couponName}, '%'))

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseSmsController.java

@@ -102,7 +102,7 @@ public class EnterpriseSmsController {
 
     @RequestMapping("/delete-sms")
     public RestResponse deleteSms(Long signId, Integer enterpriseId) {
-        ServiceResponse<Void> smsResult = smsOuterApiService.delEnterpriseSmsSign(UserDetailUtils.getUserDetail().getEnterpriseId(), signId);
+        ServiceResponse<Void> smsResult = smsOuterApiService.delEnterpriseSmsSign(enterpriseId, signId);
         if (smsResult.isSuccess()) {
             ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
             if (enterpriseResult.isSuccess()) {