update

src/main/java/com/qkdata/biz/management/service/OrganizationService.java

@@ -45,15 +45,15 @@ public class OrganizationService extends BaseServiceImpl<OrganizationMapper, Org
 
     @Override
     public boolean save(OrganizationPO po) {
-        OrganizationPO dbPO = getByName(po.getName());
+        OrganizationPO dbPO = getByNameAndType(po.getName(),po.getType());
         if (dbPO != null && dbPO.getType() == po.getType()) {
             throw new BusinessException("该机构名称已存在");
         }
         return super.save(po);
     }
 
-    private OrganizationPO getByName(String name) {
-        return baseMapper.selectOne(Wrappers.<OrganizationPO>lambdaQuery().eq(OrganizationPO::getName, name));
+    private OrganizationPO getByNameAndType(String name,OrgTypeEnum type) {
+        return baseMapper.selectOne(Wrappers.<OrganizationPO>lambdaQuery().eq(OrganizationPO::getName, name).eq(OrganizationPO::getType,type));
     }
 
     @Override

src/main/java/com/qkdata/biz/management/vo/ProductOrderModel.java

@@ -6,6 +6,7 @@ import com.qkdata.biz.enums.ProductTypeEnum;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 public class ProductOrderModel {
@@ -76,4 +77,12 @@ public class ProductOrderModel {
      * 订单状态
      */
     private ProductOrderStatusEnum status;
+    /**
+     * 订单创建时间
+     */
+    private LocalDateTime createTime;
+    /**
+     * 订单支付完成时间
+     */
+    private LocalDateTime updateTime;
 }

src/main/java/com/qkdata/biz/sys/service/ShiroService.java

@@ -23,6 +23,7 @@ import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -49,6 +50,8 @@ public class ShiroService {
     @Autowired
     @Qualifier("stringRedisTemplate")
     private StringRedisTemplate redisTemplate;
+    @Value("${spring.profiles.active}")
+    private String env;
 
 
     public Set<String> getUserPermissions(Long userId) {
@@ -115,6 +118,7 @@ public class ShiroService {
     }
 
     public FullUserInfo loginByCode(LoginByCodeModel model) {
+        if (!"dev".equals(env)){
             String cache_captcha = (String) redisTemplate.opsForValue().get(BizConstants.MOBILE_CAPTCHA_PREFIX+model.getMobile());
             if (!Strings.isNullOrEmpty(cache_captcha)){
                 cache_captcha = cache_captcha.trim();
@@ -125,6 +129,8 @@ public class ShiroService {
             }else {
                 throw new BusinessException("验证码错误");
             }
+        }
+
         FullUserInfo userInfo = sysUserService.findFullUserInfo(model.getMobile());
         if (userInfo == null){
             //用户不存在时需要注册