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

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/KylinRecommendActiveParam.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -38,12 +40,14 @@ public class KylinRecommendActiveParam implements Serializable {
      */
     @ApiModelProperty(value = "开启时间yyyy-MM-dd HH:mm:ss")
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    @NotNull(message = "开启时间必传")
     private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
     @ApiModelProperty(value = "结束时间yyyy-MM-dd HH:mm:ss")
+    @NotNull(message = "结束时间必传")
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
     private LocalDateTime endTime;
 
@@ -51,18 +55,21 @@ public class KylinRecommendActiveParam implements Serializable {
      * 活动名称
      */
     @ApiModelProperty(value = "活动名称")
+    @NotBlank(message = "活动名称必传")
     private String activeName;
 
     /**
      * 1NFT2组合购3演出4商品
      */
     @ApiModelProperty(value = "1NFT2组合购3演出4商品")
+    @NotNull(message = "关联类型必传")
     private Integer activeType;
 
     /**
      * 活动绑定id
      */
     @ApiModelProperty(value = "活动绑定id")
+    @NotBlank(message = "关联名称必传")
     private String activeBindId;
 
     /**
@@ -89,6 +96,7 @@ public class KylinRecommendActiveParam implements Serializable {
      * 0开启，1未开启
      */
     @ApiModelProperty(value = "0开启，1未开启")
+    @NotNull(message = "状态必传")
     private Integer status;
 
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinRecommendActiveController.java

@@ -6,6 +6,7 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinRecommendActiveRelationServiceImpl;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinRecommendActiveServiceImpl;
+import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.kylin.dto.param.KylinRecommendActiveParam;
 import com.liquidnet.service.kylin.dto.param.KylinRecommendActiveRelationParam;
 import com.liquidnet.service.kylin.entity.KylinRecommendActive;
@@ -14,6 +15,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -36,17 +40,34 @@ public class KylinRecommendActiveController extends BaseController {
     @PostMapping("addKylinRecommendActive")
     @ApiOperation(value = "增加活动")
     @ResponseBody
-    public AjaxResult addKylinRecommendActive(@RequestBody KylinRecommendActiveParam kylinRecommendActiveParam) {
+    public AjaxResult addKylinRecommendActive(@Validated @RequestBody KylinRecommendActiveParam kylinRecommendActiveParam,BindingResult result) {
+        if (result!=null&&result.hasErrors()) {
+            List<ObjectError> errors = result.getAllErrors();
+            if (errors != null) {
+                return AjaxResult.error(errors.get(0).getDefaultMessage());
+            }
+        }
         KylinRecommendActive kylinRecommendActive = new KylinRecommendActive();
         BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActive);
         if (kylinRecommendActiveService.validateTime(kylinRecommendActive) == 0) {
             List<KylinRecommendActiveRelation> list = new ArrayList<KylinRecommendActiveRelation>();
             if (kylinRecommendActiveParam.getList() != null) {
-                kylinRecommendActiveParam.getList().forEach(r -> {
+
+                for(KylinRecommendActiveRelationParam r:kylinRecommendActiveParam.getList()){
                     KylinRecommendActiveRelation kylinRecommendActiveRelation = new KylinRecommendActiveRelation();
+                    if(StringUtil.isBlank(r.getRecommendBindId())){
+                        return AjaxResult.error("操作失败", "推荐商品id不能为空");
+                    }else if(StringUtil.isBlank(r.getRecommendActiveId())){
+                        return AjaxResult.error("操作失败", "推荐活动id不能为空");
+                    }else if(null==r.getType()){
+                        return AjaxResult.error("操作失败", "推荐类型不能为空");
+                    }
                     BeanUtils.copyProperties(r, kylinRecommendActiveRelation);
                     list.add(kylinRecommendActiveRelation);
-                });
+                }
+           /*     kylinRecommendActiveParam.getList().forEach(r -> {
+
+                });*/
             }
             kylinRecommendActiveService.addKylinRecommendActive(kylinRecommendActive, list);
             return AjaxResult.success("操作成功", "");
@@ -68,6 +89,15 @@ public class KylinRecommendActiveController extends BaseController {
     @ApiOperation(value = "增加或者修改活动推荐List")
     @ResponseBody
     public AjaxResult addOrUpdateListKylinRecommendActiveRelation(@RequestBody List<KylinRecommendActiveRelationParam> kylinRecommendActiveParam) {
+        for(KylinRecommendActiveRelationParam k:kylinRecommendActiveParam){
+            if(StringUtil.isBlank(k.getRecommendBindId())){
+                return AjaxResult.error("操作失败", "推荐商品id不能为空");
+            }else if(StringUtil.isBlank(k.getRecommendActiveId())){
+                return AjaxResult.error("操作失败", "推荐活动id不能为空");
+            }else if(null==k.getType()){
+                return AjaxResult.error("操作失败", "推荐类型不能为空");
+            }
+        }
         if(kylinRecommendActiveParam.size()>20){
             return AjaxResult.error("操作失败", "推荐活动不允许超过20个！！！");
         }
@@ -93,7 +123,14 @@ public class KylinRecommendActiveController extends BaseController {
     @PostMapping("updateKylinRecommendActive")
     @ApiOperation(value = "修改活动")
     @ResponseBody
-    public AjaxResult updateKylinRecommendActive(@RequestBody KylinRecommendActiveParam kylinRecommendActiveParam) {
+    public AjaxResult updateKylinRecommendActive(@Validated @RequestBody  KylinRecommendActiveParam kylinRecommendActiveParam, BindingResult result) {
+        /*BindingResult result = exception.getBindingResult();*/
+        if (result!=null&&result.hasErrors()) {
+            List<ObjectError> errors = result.getAllErrors();
+            if (errors != null) {
+                return AjaxResult.error(errors.get(0).getDefaultMessage());
+            }
+        }
         KylinRecommendActive kylinRecommendActive = new KylinRecommendActive();
         BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActive);
         if (kylinRecommendActiveService.validateTime(kylinRecommendActive) == 0) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/affiliatedActivity/add.html

@@ -309,13 +309,6 @@
 
         $("#activeType").attr('value', 1)
 
-        // 选择select
-        $('#activeType').change(function () {
-            activeTypeChangeVal = Number($(this).val()) // 1 2 3 4
-            currentUrl = affiliatedUrl[activeTypeChangeVal - 1] // 获取选中的，对应地址
-
-        })
-
         // 监听 模糊搜索
         let search = new searchSelect('#search', [], function(val) {
             let _params = {}
@@ -367,6 +360,21 @@
             })
         })
 
+        // 选择select
+        $('#activeType').change(function () {
+            activeTypeChangeVal = Number($(this).val()) // 1 2 3 4
+            currentUrl = affiliatedUrl[activeTypeChangeVal - 1] // 获取选中的，对应地址
+            search.empty().empty()
+            $('#search input').attr('value', '')
+            $('#search input').attr('data-id', '')
+        })
+
+        $('#search input').focus(function () {
+            search.empty().empty()
+            $('#search input').attr('value', '')
+            $('#search input').attr('data-id', '')
+        })
+
     }) // init end
 
     getPageData() // 最开始加载
@@ -384,7 +392,14 @@
             for (let i = 0; i < list.length; i++) {
                 createListenerSearch(i + 1)
                 $(`#listActiveType${i+1}`).change(function () {
+                    varObj[Object.keys(varObj)[i]].empty()
                     $('#listRemoteSearch' + (i + 1) + ' input').attr('value', '')
+                    $('#listRemoteSearch' + (i + 1) + ' input').attr('data-id', '')
+
+                })
+                $('#listRemoteSearch' + (i + 1) + ' input').focus(function () {
+                    $(this).val('')
+                    $(this).attr('data-id', '')
                 })
             }
         }, 500)
@@ -474,10 +489,24 @@
 
             setTimeout(() => {
                 $(`#listActiveType${count}`).change(function () {
+                    varObj[Object.keys(varObj)[count - 1]].empty()
                     $('#listRemoteSearch' + (count) + ' input').attr('value', '')
+                    $('#listRemoteSearch' + (count) + ' input').attr('data-id', '')
+                })
+                $('#listRemoteSearch' + (count) + ' input').focus(function () {
+                    $(this).val('')
+                    $(this).attr('data-id', '')
                 })
 
-            }, 800)
+            }, 600)
+
+            setTimeout(() => {
+                $('#listRemoteSearch' + (count) + ' input').focus(function () {
+                    $(this).val('')
+                    $(this).attr('data-id', '')
+                })
+
+            }, 600)
 
         } else {
             layer.msg('不能添加')
@@ -649,7 +678,7 @@
             return
         }
 
-        let idList = listData.filter(item => item.recommendBindId == undefined)
+        let idList = listData.filter(item => !item.recommendBindId)
 
         if (idList.length >= 1) {
             layer.msg('推荐活动需填写完整')

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/affiliatedActivity/edit.html

@@ -308,13 +308,6 @@
             });
         });
 
-        // 选择select
-        $('#activeType').change(function () {
-            activeTypeChangeVal = Number($(this).val()) // 1 2 3 4
-            currentUrl = affiliatedUrl[activeTypeChangeVal - 1] // 获取选中的，对应地址
-            $('#search input').attr('value', '')
-        })
-
         // 监听 模糊搜索
         let search = new searchSelect('#search', [], function(val) {
             let _params = {}
@@ -367,6 +360,21 @@
         })
         search.search(true)
 
+        // 选择select
+        $('#activeType').change(function () {
+            activeTypeChangeVal = Number($(this).val()) // 1 2 3 4
+            currentUrl = affiliatedUrl[activeTypeChangeVal - 1] // 获取选中的，对应地址
+            search.empty()
+            $('#search input').attr('value', '')
+            $('#search input').attr('data-id', '')
+        })
+
+        $('#search input').focus(function () {
+            search.empty().empty()
+            $('#search input').attr('value', '')
+            $('#search input').attr('data-id', '')
+        })
+
     }) // init end
 
     getPageData() // 最开始加载
@@ -411,7 +419,13 @@
                         for (let i = 0; i < list.length; i++) {
                             createListenerSearch(i + 1)
                             $(`#listActiveType${i+1}`).change(function () {
+                                varObj[Object.keys(varObj)[i]].empty()
                                 $('#listRemoteSearch' + (i + 1) + ' input').attr('value', '')
+                                $('#listRemoteSearch' + (i + 1) + ' input').attr('data-id', '')
+                            })
+                            $('#listRemoteSearch' + (i + 1) + ' input').focus(function () {
+                                $(this).val('')
+                                $(this).attr('data-id', '')
                             })
                         }
                     }, 500)
@@ -510,9 +524,23 @@
 
             setTimeout(() => {
                 $(`#listActiveType${count}`).change(function () {
+                    varObj[Object.keys(varObj)[count - 1]].empty()
                     $('#listRemoteSearch' + count + ' input').attr('value', '')
+                    $('#listRemoteSearch' + count + ' input').attr('data-id', '')
                 })
 
+            }, 600)
+
+            setTimeout(() => {
+                $('#listRemoteSearch' + count + ' input').focus(function () {
+                    $(this).val('')
+                    $(this).attr('data-id', '')
+                })
+
+                // $('#listRemoteSearch' + count + ' input').blur(function () {
+                //
+                // })
+
             }, 800)
 
         } else {
@@ -549,7 +577,7 @@
             })
         })
 
-        let idList = listData.filter(item => item.recommendBindId == undefined)
+        let idList = listData.filter(item => !item.recommendBindId)
 
         if (idList.length >= 1) {
             layer.msg('推荐活动需填写完整')

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

@@ -80,9 +80,9 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
         String[] mobileLocateArr = adamRdmService.getMobileLocateArr(mobile);
         toMqSqls.add(SqlMapping.get("adam_user_mobile_locate.add"));
-        if (null != mobileLocateArr && mobileLocateArr.length > 0) {
         String cliIpAddr = CurrentUtil.getCliIpAddr();
         String headerCliSource = CurrentUtil.getHeaderCliSource();
+        if (null != mobileLocateArr && mobileLocateArr.length > 0) {
             initUserMobileLocateObjs.add(new Object[]{
                     userInfoVo.getUid(), mobile, 1,
                     mobileLocateArr[0], mobileLocateArr[1], mobileLocateArr[2], mobileLocateArr[3], mobileLocateArr[4],
@@ -90,6 +90,12 @@ public class AdamUserServiceImpl implements IAdamUserService {
             });
             userInfoVo.setProvince(mobileLocateArr[0]);
             userInfoVo.setCity(mobileLocateArr[1]);
+        } else {
+            initUserMobileLocateObjs.add(new Object[]{
+                    userInfoVo.getUid(), mobile, 1,
+                    null, null, null, null, null,
+                    mobile, cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now
+            });
         }
 
         long s = System.currentTimeMillis();
@@ -139,9 +145,9 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
             String[] mobileLocateArr = adamRdmService.getMobileLocateArr(param.getMobile());
             toMqSqls.add(SqlMapping.get("adam_user_mobile_locate.add"));
-            if (null != mobileLocateArr && mobileLocateArr.length > 0) {
             String cliIpAddr = CurrentUtil.getCliIpAddr();
             String headerCliSource = CurrentUtil.getHeaderCliSource();
+            if (null != mobileLocateArr && mobileLocateArr.length > 0) {
                 initUserMobileLocateObjs.add(new Object[]{
                         registerUid, userInfoVo.getMobile(), 1,
                         mobileLocateArr[0], mobileLocateArr[1], mobileLocateArr[2], mobileLocateArr[3], mobileLocateArr[4],
@@ -149,6 +155,12 @@ public class AdamUserServiceImpl implements IAdamUserService {
                 });
                 userInfoVo.setProvince(mobileLocateArr[0]);
                 userInfoVo.setCity(mobileLocateArr[1]);
+            } else {
+                initUserMobileLocateObjs.add(new Object[]{
+                        registerUid, userInfoVo.getMobile(), 1,
+                        null, null, null, null, null,
+                        userInfoVo.getMobile(), cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now
+                });
             }
 
             adamRdmService.setUserInfoVoByUid(registerUid, userInfoVo);