Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberVo.java

 package com.liquidnet.service.adam.dto.vo;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.adam.entity.AdamMember;
-import com.liquidnet.service.adam.entity.AdamMemberPrice;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.beans.BeanUtils;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @ApiModel(value = "AdamMemberVo", description = "会员")
@@ -72,6 +67,7 @@ public class AdamMemberVo implements java.io.Serializable, Cloneable {
     }
 
     public AdamMemberVo copy(AdamMember source) {
+        if (null == this) return this;
         this.setMemberId(source.getMemberId());
         this.setName(source.getName());
         this.setTitle(source.getTitle());

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.adam;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberAdminService;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberCodeAdminService;
+import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberPriceAdminService;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.AdamMemberCodeParam;
 import com.liquidnet.service.adam.dto.AdamMemberParam;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.entity.AdamMember;
+import com.liquidnet.service.adam.entity.AdamMemberPrice;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -19,8 +22,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,6 +38,8 @@ public class AdamMemberAdminController {
     @Autowired
     IAdamMemberAdminService adamMemberService;
     @Autowired
+    IAdamMemberPriceAdminService adamMemberPriceAdminService;
+    @Autowired
     IAdamMemberCodeAdminService adamMemberCodeAdminService;
     @Autowired
     RedisUtil redisUtil;
@@ -41,7 +48,11 @@ public class AdamMemberAdminController {
     @ApiOperation(value = "会员卡列表")
     @PostMapping("list")
     public ResponseDto<List<AdamMemberVo>> list() {
-        List<AdamMember> list = adamMemberService.list();
+        List<AdamMember> list = adamMemberService.list(
+                Wrappers.lambdaQuery(AdamMember.class).select(
+                        AdamMember::getMemberId, AdamMember::getName, AdamMember::getTitle, AdamMember::getType, AdamMember::getState
+                )
+        );
         List<AdamMemberVo> vos = new ArrayList<>();
         list.forEach(r -> {
             vos.add(AdamMemberVo.getNew().copy(r));
@@ -52,14 +63,44 @@ public class AdamMemberAdminController {
     @RequiresPermissions("adam:member:add")
     @ApiOperation(value = "添加会员卡")
     @PostMapping("add")
-    public ResponseDto<Object> add(@RequestBody AdamMemberParam parameter) {
-        return ResponseDto.success(adamMemberService.add(parameter));
+    public ResponseDto<Object> add(@Valid @RequestBody AdamMemberParam parameter) {
+        adamMemberService.add(parameter);
+        return ResponseDto.success();
+    }
+
+    @RequiresPermissions("adam:member:info")
+    @ApiOperation(value = "会员卡详情")
+    @PostMapping("info")
+    public ResponseDto<Object> info(@NotBlank @RequestParam String memberId) {
+        return ResponseDto.success(adamMemberService.getOne(
+                Wrappers.lambdaQuery(AdamMember.class).eq(AdamMember::getMemberId, memberId)
+        ));
+    }
+
+    @RequiresPermissions("adam:member:edit")
+    @ApiOperation(value = "会员卡编辑")
+    @PostMapping("edit")
+    public ResponseDto<Object> edit(@Valid @RequestBody AdamMemberParam parameter) {
+        adamMemberService.edit(parameter);
+        return ResponseDto.success();
     }
 
     @RequiresPermissions("adam:member:gen_code")
     @ApiOperation(value = "生成兑换码")
     @PostMapping("gen_code")
-    public ResponseDto<String> genMemberCode(@RequestBody AdamMemberCodeParam parameter) {
+    public ResponseDto<String> genMemberCode(@Valid @RequestBody AdamMemberCodeParam parameter) {
+        if (1 != parameter.getType()) {
+            return ResponseDto.failure("参数有误[TYPE]");
+        }
+        int count = adamMemberPriceAdminService.count(
+                Wrappers.lambdaQuery(AdamMemberPrice.class)
+                        .eq(AdamMemberPrice::getMemberPriceId, parameter.getMemberPriceId())
+                        .eq(AdamMemberPrice::getMemberId, parameter.getMemberId())
+                        .eq(AdamMemberPrice::getState, 1)
+        );
+        if (count <= 0) {
+            return ResponseDto.failure("会员卡ID/价格ID无效");
+        }
         return ResponseDto.success(adamMemberCodeAdminService.createGiftCode(parameter));
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-client-admin-web.yml

@@ -9,9 +9,10 @@ eureka:
 spring:
   cloud:
     config:
-      #      uri: http://127.0.0.1:7002/support-config
-      profile: ${liquidnet.cloudConfig.profile}
+#      uri: http://127.0.0.1:7002/support-config
+#      uri: http://39.106.122.201:7002/support-config
       name: ${spring.application.name},${spring.application.name}-druid #默认为spring.application.name
+      profile: ${liquidnet.cloudConfig.profile}
       discovery:
         enabled: true
         service-id: liquidnet-support-config

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/IAdamMemberAdminService.java

@@ -10,5 +10,7 @@ import com.liquidnet.service.base.ResponseDto;
  * 会员信息
  */
 public interface IAdamMemberAdminService extends IService<AdamMember> {
-    AdamMemberVo add(AdamMemberParam info);
+    void add(AdamMemberParam parameter);
+
+    void edit(AdamMemberParam parameter);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberServiceAdminImpl.java

@@ -5,18 +5,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberAdminService;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.AdamMemberParam;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.entity.AdamMember;
 import com.liquidnet.service.adam.mapper.AdamMemberMapper;
-import com.liquidnet.service.base.ResponseDto;
 import lombok.extern.slf4j.Slf4j;
+import org.bson.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -34,9 +36,9 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
     RedisUtil redisUtil;
 
     @Override
-    public AdamMemberVo add(AdamMemberParam param) {
+    public void add(AdamMemberParam parameter) {
         AdamMember adamMember = new AdamMember();
-        BeanUtils.copyProperties(param, adamMember);
+        BeanUtils.copyProperties(parameter, adamMember);
 
         List<AdamMember> existList = adamMemberMapper.selectList(Wrappers.lambdaQuery());
 
@@ -46,14 +48,31 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
         adamMember.setCreatedAt(LocalDateTime.now());
         adamMember.setUpdatedAt(LocalDateTime.now());
 
-        adamMemberMapper.insert(adamMember);
-
         AdamMemberVo vo = AdamMemberVo.getNew().copy(adamMember);
 
+        adamMemberMapper.insert(adamMember);
         mongoTemplate.insert(vo, AdamMemberVo.class.getSimpleName());
-
         redisUtil.set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(vo.getMemberId()), vo);
+    }
+
+    @Override
+    public void edit(AdamMemberParam parameter) {
+        AdamMember adamMember = new AdamMember();
+        BeanUtils.copyProperties(parameter, adamMember);
+        adamMember.setUpdatedAt(LocalDateTime.now());
+        AdamMemberVo vo = AdamMemberVo.getNew().copy(adamMember);
 
-        return vo;
+        adamMemberMapper.update(adamMember, Wrappers.lambdaQuery(AdamMember.class).eq(AdamMember::getMemberId, parameter.getMemberId()));
+        if (2 == vo.getState()) {
+            mongoTemplate.remove(Query.query(Criteria.where("memberId").is(adamMember.getMemberId())), AdamMemberVo.class.getSimpleName());
+            redisUtil.del(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(vo.getMemberId()));
+        } else {
+            mongoTemplate.updateFirst(
+                    Query.query(Criteria.where("memberId").is(adamMember.getMemberId())),
+                    Update.fromDocument(Document.parse(JsonUtils.toJson(adamMember))),
+                    AdamMemberVo.class.getSimpleName()
+            );
+            redisUtil.set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(vo.getMemberId()), vo);
+        }
     }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -614,12 +614,16 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             log.debug("redis 修改订单列表 -> time:" + (currentTime) + "毫秒");
 
             // 执行sql
+            try {
                 String sqlData = SqlMapping.gets(sqls, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataA);
                 currentTime = System.currentTimeMillis();
                 rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE, MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
                         sqlData);
                 currentTime = System.currentTimeMillis() - currentTime;
                 log.debug("MQ 发送 -> time:" + (currentTime) + "毫秒");
+            }catch (Exception e){
+                log.error("WARNING Kylin MQ Error = " + e.getMessage());
+            }
             log.info(UserPathDto.setData("下单(唤起支付)", payOrderParam, payResultVo));
             return ResponseDto.success(payResultVo);
         }catch (Exception e){