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

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/admin/AdamMemberCodeGenParam.java

 package com.liquidnet.service.adam.dto.admin;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.Max;
@@ -10,22 +8,17 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
-@ApiModel(value = "AdamMemberCodeListParam", description = "会员码列表入参")
 @Data
 public class AdamMemberCodeGenParam implements Serializable {
     private static final long serialVersionUID = 7212595876649709617L;
     @NotBlank(message = "会员类型ID不能为空")
-    @ApiModelProperty(required = true, value = "会员类型ID[64]", example = "1")
     private String memberId;
     @NotBlank(message = "会员价格ID不能为空")
-    @ApiModelProperty(required = true, value = "会员价格ID[64]", example = "1")
     private String memberPriceId;
-    @NotNull(message = "有效期不能为空")
-    @ApiModelProperty(required = true, value = "有效期", example = "30")
-    private Integer validity;
     @NotNull(message = "生成数量不能为空")
     @Min(1)
     @Max(100)
-    @ApiModelProperty(required = true, value = "生成数量[1-100]", example = "1")
     private Integer genNum;
+    @NotBlank(message = "备注描述不能为空")
+    private String detail;
 }

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/admin/AdamMemberCodeListParam.java

 package com.liquidnet.service.adam.dto.admin;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
-@ApiModel(value = "AdamMemberCodeListParam", description = "会员码列表入参")
+//@ApiModel(value = "AdamMemberCodeListParam", description = "会员码列表入参")
 @Data
 public class AdamMemberCodeListParam implements Serializable {
     private static final long serialVersionUID = -8454342033562304457L;
-    @ApiModelProperty(required = false, value = "会员类型ID[64]")
-    private String memberId;
-    @ApiModelProperty(required = false, value = "状态[0-可用|1-已用|2-无效|3-过期｜4-失效｜5-退回]")
+//    @ApiModelProperty(required = false, value = "会员码批次号[64]")
+    private String batchNo;
+//    @ApiModelProperty(required = false, value = "状态[0-可用|1-已用|2-无效|3-过期｜4-失效｜5-退回]")
     private Integer state;
 }

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

@@ -10,10 +10,12 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-@ApiModel(value = "AdamMemberCodeAdminVo", description = "会员码兑换")
+@ApiModel(value = "AdamMemberCodeVo", description = "会员兑换码")
 @Data
 public class AdamMemberCodeVo implements Serializable, Cloneable {
     private static final long serialVersionUID = -2822442493419088086L;
+    @ApiModelProperty(position = 0, value = "会员码批次号")
+    private String batchNo;
     @ApiModelProperty(position = 0, value = "会员码")
     private String code;
     @ApiModelProperty(position = 1, value = "会员类型id")

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

@@ -91,6 +91,7 @@ public class AdamMemberAdminController extends BaseController {
                         AdamMember::getInterestsDetail,
                         AdamMember::getNotes,
                         AdamMember::getType,
+                        AdamMember::getOnsale,
                         AdamMember::getIntegralRate
                 )
         );

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/code.html → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/code/code.html

@@ -31,9 +31,9 @@
 			<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="adam:member:export:code">
 				<i class="fa fa-download"></i> 导出
 			</a>
-			<a class="btn btn-primary multiple disabled" onclick="invalidHandler()" shiro:hasPermission="adam:member:invalid:code">
-				<i class="fa fa-edit"></i> 批量失效
-			</a>
+<!--			<a class="btn btn-primary multiple disabled" onclick="invalidHandler()" shiro:hasPermission="adam:member:invalid:code">-->
+<!--				<i class="fa fa-edit"></i> 批量失效-->
+<!--			</a>-->
 <!--			<a class="btn btn-danger multiple disabled" onclick="recoverHandler()" shiro:hasPermission="adam:member:recover:code">-->
 <!--				<i class="fa fa-remove"></i> 批量退回-->
 <!--			</a>-->
@@ -47,24 +47,24 @@
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js" />
 <script th:inline="javascript">
-	var invalidFlag = [[${@permission.hasPermi('adam:member:invalid:code')}]];
-	var recoverFlag = [[${@permission.hasPermi('adam:member:recover:code')}]];
+	// var invalidFlag = [[${@permission.hasPermi('adam:member:code:invalid')}]];
+	// var recoverFlag = [[${@permission.hasPermi('adam:member:code:recover')}]];
 
 	var datas = [[${@dict.getType('zhengzai_coupon_code_state')}]];// 样例：[{"dictLabel":"未支付","dictValue":"0"},{"dictLabel":"已支付","dictValue":"1"},{"dictLabel":"已关闭","dictValue":"2"}]
 	var memberId = [[${memberId}]];
-	var prefix = ctx + "adam/member";
+	var prefix = ctx + "adam/mcode";
 
 	$(function() {
 		var options = {
-			url: prefix + "/list_code",
-			exportUrl: prefix + "/export_code",
-			detailUrl: ctx + "adam/order/orderList/detail/{id}",
+			url: prefix + "/list",
+			exportUrl: prefix + "/export",
 			sortName: "code",
 			sortOrder: "asc",
 			modalName: "会员码",
-			columns: [{
-				checkbox: true
-			},
+			columns: [
+				{
+					checkbox: true
+				},
 				{
 					field: 'code',
 					title: '会员码'
@@ -98,19 +98,20 @@
 						return $.table.selectDictLabel(datas, value);
 					}
 				},
-				{
-					title: '操作',
-					align: 'center',
-					formatter: function(value, row, index) {
-						var actions = [];
-						if (row.state === 0) {
-							actions.push('<a class="btn btn-primary btn-xs ' + (invalidFlag && row.state===0) + '" href="javascript:void(0)" onclick="invalidHandler(\'' + row.code + '\')"><i class="fa fa-edit"></i>失效</a> ');
-						} else if (row.state === 1) {
-							// actions.push('<a class="btn btn-danger btn-xs ' + (recoverFlag && row.state==0) + '" href="javascript:void(0)" onclick="recoverHandler(\'' + row.code + '\')"><i class="fa fa-remove"></i>退回</a>');
-						}
-						return actions.join('');
-					}
-				}]
+				// {
+				// 	title: '操作',
+				// 	align: 'center',
+				// 	formatter: function(value, row, index) {
+				// 		var actions = [];
+				// 		if (row.state === 0) {
+				// 			actions.push('<a class="btn btn-primary btn-xs ' + (invalidFlag && row.state===0) + '" href="javascript:void(0)" onclick="invalidHandler(\'' + row.code + '\')"><i class="fa fa-edit"></i>失效</a> ');
+				// 		} else if (row.state === 1) {
+				// 			// actions.push('<a class="btn btn-danger btn-xs ' + (recoverFlag && row.state==0) + '" href="javascript:void(0)" onclick="recoverHandler(\'' + row.code + '\')"><i class="fa fa-remove"></i>退回</a>');
+				// 		}
+				// 		return actions.join('');
+				// 	}
+				// }
+			]
 		};
 		$.table.init(options);
 	});
@@ -119,29 +120,29 @@
 		$.form.reset();
 	}
 
-	function invalidHandler(code) {
-		let invalidCodeUrl = prefix + '/invalid_code';
-		if (code !== null && code !== undefined) {
-			var data = {"memberId": memberId,"codes": code};
-			$.operate.submit(invalidCodeUrl, "post", "json", data);
-		} else {
-			var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
-			var data = {"memberId": memberId, "codes": rows.join()};
-			$.operate.batchProcessing(invalidCodeUrl, '失效', data);
-		}
-	}
-
-	function recoverHandler(code) {
-		let recoverCodeUrl = prefix + '/recover_code';
-		if (code !== null && code !== undefined) {
-			var data = {"memberId": memberId,"codes": code};
-			$.operate.submit(recoverCodeUrl, "post", "json", data);
-		} else {
-			var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
-			var data = {"memberId": memberId, "codes": rows.join()};
-			$.operate.batchProcessing(recoverCodeUrl, '失效', data);
-		}
-	}
+	// function invalidHandler(code) {
+	// 	let invalidCodeUrl = prefix + '/invalid_code';
+	// 	if (code !== null && code !== undefined) {
+	// 		var data = {"memberId": memberId,"codes": code};
+	// 		$.operate.submit(invalidCodeUrl, "post", "json", data);
+	// 	} else {
+	// 		var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
+	// 		var data = {"memberId": memberId, "codes": rows.join()};
+	// 		$.operate.batchProcessing(invalidCodeUrl, '失效', data);
+	// 	}
+	// }
+	//
+	// function recoverHandler(code) {
+	// 	let recoverCodeUrl = prefix + '/recover_code';
+	// 	if (code !== null && code !== undefined) {
+	// 		var data = {"memberId": memberId,"codes": code};
+	// 		$.operate.submit(recoverCodeUrl, "post", "json", data);
+	// 	} else {
+	// 		var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
+	// 		var data = {"memberId": memberId, "codes": rows.join()};
+	// 		$.operate.batchProcessing(recoverCodeUrl, '失效', data);
+	// 	}
+	// }
 </script>
 </body>
 </html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/code/code_creation.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+	<th:block th:include="include :: header('创建会员码')" />
+</head>
+<body class="white-bg">
+	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+		<form class="form-horizontal m" id="form-code-add">
+			<input >
+			<div class="form-group">
+				<label class="col-sm-3 control-label is-required">生产数量：</label>
+				<div class="col-sm-8">
+					<input class="form-control" type="text" name="genNum" id="genNum" required>
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">备注：</label>
+				<div class="col-sm-8">
+					<textarea id="remark" name="detail" class="form-control"></textarea>
+				</div>
+			</div>
+		</form>
+	</div>
+	<th:block th:include="include :: footer" />
+	<script type="text/javascript">
+		var prefix = ctx + "system/dict";
+	
+		$("#form-code-add").validate({
+			onkeyup: false,
+			rules:{
+				dictType:{
+					minlength: 5,
+					remote: {
+		                url: prefix + "/checkDictTypeUnique",
+		                type: "post",
+		                dataType: "json",
+		                data: {
+		                	name : function() {
+		                        return $.common.trim($("#dictType").val());
+		                    }
+		                },
+		                dataFilter: function(data, type) {
+		                	return $.validate.unique(data);
+		                }
+		            }
+				},
+			},
+			messages: {
+		        "dictType": {
+		            remote: "该字典类型已经存在"
+		        }
+		    },
+		    focusCleanup: true
+		});
+		
+		function submitHandler() {
+	        if ($.validate.form()) {
+	        	$.operate.save(prefix + "/add", $('#form-code-add').serialize());
+	        }
+	    }
+	</script>
+</body>
+</html>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/code/code_mgt.html

@@ -5,109 +5,70 @@
 	<th:block th:include="include :: select2-css" />
 </head>
 <body class="gray-bg">
-<div class="container-div">
-	<div class="row">
-		<div class="col-sm-12 search-collapse">
-			<form id="data-form">
-				<div class="select-list">
-					<ul>
-						<input type="text" name="memberId" hidden="hidden" th:value="${memberId}" readonly/>
-						<li>
-							状态：<select name="state" th:with="type=${@dict.getType('zhengzai_coupon_code_state')}">
-							<option value="">所有</option>
-							<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-						</select>
-						</li>
-						<li>
-							<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-							<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-						</li>
-					</ul>
-				</div>
-			</form>
-		</div>
-
-		<div class="btn-group-sm" id="toolbar" role="group">
-			<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="adam:member:export:code">
-				<i class="fa fa-download"></i> 导出
-			</a>
-			<a class="btn btn-primary multiple disabled" onclick="invalidHandler()" shiro:hasPermission="adam:member:invalid:code">
-				<i class="fa fa-edit"></i> 批量失效
-			</a>
-<!--			<a class="btn btn-danger multiple disabled" onclick="recoverHandler()" shiro:hasPermission="adam:member:recover:code">-->
-<!--				<i class="fa fa-remove"></i> 批量退回-->
-<!--			</a>-->
-		</div>
+	<div class="container-div">
+		<div class="row">
+			<div class="btn-group-sm" id="toolbar" role="group">
+				<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="adam:member:code:creation">
+					<i class="fa fa-plus"></i> 创建
+				</a>
+			</div>
 
-		<div class="col-sm-12 select-table table-striped">
-			<table id="bootstrap-table"></table>
+			<div class="col-sm-12 select-table table-striped">
+				<table id="bootstrap-table"></table>
+			</div>
 		</div>
 	</div>
-</div>
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js" />
 <script th:inline="javascript">
-	var invalidFlag = [[${@permission.hasPermi('adam:member:invalid:code')}]];
-	var recoverFlag = [[${@permission.hasPermi('adam:member:recover:code')}]];
-
-	var datas = [[${@dict.getType('zhengzai_coupon_code_state')}]];// 样例：[{"dictLabel":"未支付","dictValue":"0"},{"dictLabel":"已支付","dictValue":"1"},{"dictLabel":"已关闭","dictValue":"2"}]
 	var memberId = [[${memberId}]];
-	var prefix = ctx + "adam/member";
+	var prefix = ctx + "adam/mcode";
 
 	$(function() {
 		var options = {
-			url: prefix + "/list_code",
+			url: prefix + "/mgt/list?memberId=" + memberId,
 			exportUrl: prefix + "/export_code",
 			detailUrl: ctx + "adam/order/orderList/detail/{id}",
 			sortName: "code",
 			sortOrder: "asc",
-			modalName: "会员码",
+			modalName: "会员码创建记录",
 			columns: [{
 				checkbox: true
 			},
 				{
-					field: 'code',
-					title: '会员码'
+					field: 'memberName',
+					title: '会员名称'
 				},
 				{
-					field: 'expireAt',
-					title: '到期时间'
+					field: 'memberCombo',
+					title: '会员套餐名称'
 				},
 				{
-					field: 'useAt',
-					title: '使用时间'
+					field: 'genNum',
+					title: '生产数量'
 				},
 				{
-					field: 'useOrderNo',
-					title: '兑换订单号',
-					formatter: function(value, row, index) {
-						var actions = [];
-						if ($.common.isEmpty(value)) {
-							actions.push('<a href="javascript:void(0)">-</a>');
-						} else {
-							actions.push('<a href="javascript:void(0)" onclick="$.operate.detailTab(\'' + value + '\')">' + value + '</a>');
-						}
-						return actions.join('');
-					}
+					field: 'useNum',
+					title: '使用数量'
 				},
 				{
-					field: 'state',
-					title: '状态',
-					align: 'center',
-					formatter: function(value, row, index) {
-						return $.table.selectDictLabel(datas, value);
-					}
+					field: 'detail',
+					title: '备注'
+				},
+				{
+					field: 'operator',
+					title: '创建人'
+				},
+				{
+					field: 'createdAt',
+					title: '创建时间'
 				},
 				{
 					title: '操作',
 					align: 'center',
 					formatter: function(value, row, index) {
 						var actions = [];
-						if (row.state === 0) {
-							actions.push('<a class="btn btn-primary btn-xs ' + (invalidFlag && row.state===0) + '" href="javascript:void(0)" onclick="invalidHandler(\'' + row.code + '\')"><i class="fa fa-edit"></i>失效</a> ');
-						} else if (row.state === 1) {
-							// actions.push('<a class="btn btn-danger btn-xs ' + (recoverFlag && row.state==0) + '" href="javascript:void(0)" onclick="recoverHandler(\'' + row.code + '\')"><i class="fa fa-remove"></i>退回</a>');
-						}
+						actions.push('<a class="btn btn-primary btn-xs ' + (invalidFlag && row.state===0) + '" href="javascript:void(0)" onclick="memberCodeList(\'' + row.batchNo + '\')"><i class="fa fa-edit"></i>查看码列表</a> ');
 						return actions.join('');
 					}
 				}]
@@ -115,32 +76,9 @@
 		$.table.init(options);
 	});
 
-	function resetPre() {
-		$.form.reset();
-	}
-
-	function invalidHandler(code) {
-		let invalidCodeUrl = prefix + '/invalid_code';
-		if (code !== null && code !== undefined) {
-			var data = {"memberId": memberId,"codes": code};
-			$.operate.submit(invalidCodeUrl, "post", "json", data);
-		} else {
-			var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
-			var data = {"memberId": memberId, "codes": rows.join()};
-			$.operate.batchProcessing(invalidCodeUrl, '失效', data);
-		}
-	}
-
-	function recoverHandler(code) {
-		let recoverCodeUrl = prefix + '/recover_code';
-		if (code !== null && code !== undefined) {
-			var data = {"memberId": memberId,"codes": code};
-			$.operate.submit(recoverCodeUrl, "post", "json", data);
-		} else {
-			var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
-			var data = {"memberId": memberId, "codes": rows.join()};
-			$.operate.batchProcessing(recoverCodeUrl, '失效', data);
-		}
+	/* 会员码列表 */
+	function memberCodeList(batchNo) {
+		$.modal.openTab("会员码列表", 'adam/mcode/view?batchNo=' + batchNo);
 	}
 </script>
 </body>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/info.html

@@ -201,11 +201,11 @@
                                         <label class="col-sm-2 control-label">是否开售：</label>
                                         <div class="col-sm-10">
                                             <div class="radio-box">
-                                                <input type="radio" id="radio1" th:field="*{onsale}" name="onsale" value="2">
+                                                <input type="radio" id="radio1" th:checked="*{onsale==2}" name="onsale" value="2">
                                                 <label for="radio1">否</label>
                                             </div>
                                             <div class="radio-box">
-                                                <input type="radio" id="radio2" th:field="*{onsale}" name="onsale" value="1">
+                                                <input type="radio" id="radio2" th:checked="*{onsale==1}" name="onsale" value="1">
                                                 <label for="radio2">是</label>
                                             </div>
                                         </div>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/member.html

@@ -16,7 +16,7 @@
 <th:block th:include="include :: select2-js" />
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('adam:member:view:edit')}]];
-    var viewMemberCodeFlag = [[${@permission.hasPermi('adam:member:list:code')}]];
+    var viewMemberCodeMgtFlag = [[${@permission.hasPermi('adam:member:code:mgt:list')}]];
     var prefix = ctx + "adam/member";
 
     $(function() {
@@ -69,7 +69,7 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.memberId + '\'); setVipTabs()"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + viewMemberCodeFlag + '" href="javascript:void(0)" onclick="memberCodeList(\'' + row.memberId + '\')"><i class="fa fa-edit"></i>会员码</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + viewMemberCodeMgtFlag + '" href="javascript:void(0)" onclick="memberCodeMgt(\'' + row.memberId + '\')"><i class="fa fa-edit"></i>会员码管理</a> ');
                         return actions.join('');
                     }
                 }]
@@ -77,9 +77,9 @@
         $.table.init(options);
     });
 
-    /* 查看码列表 */
-    function memberCodeList(memberId) {
-        $.modal.openTab("会员码列表", 'adam/member/code/' + memberId);
+    /* 会员码管理 */
+    function memberCodeMgt(memberId) {
+        $.modal.openTab("会员码管理", 'adam/mcode/mgt?memberId=' + memberId);
     }
 
     function setVipTabs () {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/memberbanner.html

-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <th:block th:include="include :: header('请上传banner')"/>
-    <th:block th:include="include :: bootstrap-fileinput-css"/>
-</head>
-<body class="white-bg">
-
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: bootstrap-fileinput-js"/>
-<th:block th:include="include :: bootstrap-fileinput-css" />
-<script type="text/javascript">
-
-    $(function () {
-
-        $("#fileinput-demo-1").fileinput({
-            'theme': 'explorer-fas',
-            // 'uploadUrl': "/kylin/banners/upload3",
-            // 'uploadUrl': "http://127.0.0.1:9003" + "/platform/basicServices/alOss/upload",
-            'uploadUrl': platformUrl + "/platform/basicServices/alOss/upload",
-            "uploadExtraData": {
-                "pathName" : "banner",
-                "buckType" : 1
-            },
-            // overwriteInitial: false,
-            // initialPreviewAsData: true,
-            autoReplace: true,
-            dropZoneTitle: "请上传文件",
-            maxFileCount: 1
-        });
-    })
-</script>
-</body>
-</html>

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

@@ -52,9 +52,9 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
             // 需要主动生成会员编号
             //initMemberCode.setMemberNo(getNextMemberNo(param.getMemberId()));
             initMemberCode.setState(0);// 状态[0-可用|1-已用|2-无效|3-过期｜4-失效｜5-退回]
-            initMemberCode.setValidity(param.getValidity());
-            initMemberCode.setEffectAt(now);
-            initMemberCode.setExpireAt(now.plusDays(param.getValidity()).withHour(23).withMinute(59).withSecond(59));
+//            initMemberCode.setValidity(param.getValidity());
+//            initMemberCode.setEffectAt(now);
+//            initMemberCode.setExpireAt(now.plusDays(param.getValidity()).withHour(23).withMinute(59).withSecond(59));
             initMemberCode.setCreatedAt(now);
 
             memberCodeList.add(initMemberCode);

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMemberCode.java

@@ -16,6 +16,11 @@ public class AdamMemberCode {
 
     @TableId(value = "mid", type = IdType.AUTO)
     private Long mid;
+
+    /**
+     * 会员码批次号
+     */
+    private String batchNo;
     /**
      * 会员码
      */
@@ -54,7 +59,7 @@ public class AdamMemberCode {
     private LocalDateTime expireAt;
 
     /**
-     * type=2时记录创建人
+     * 操作人
      */
     private String operator;
 

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMemberCodeBatch.java

@@ -62,7 +62,7 @@ public class AdamMemberCodeBatch implements Serializable {
     /**
      * 描述
      */
-    private String describe;
+    private String detail;
 
     /**
      * 有效期（单位天）

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/adam/PlatformAdamMemberOrderCallbackController.java

@@ -37,7 +37,7 @@ public class PlatformAdamMemberOrderCallbackController {
     })
     @PostMapping("refund")
     public String refund(HttpServletRequest request) {
-        log.debug("/amorder/callack/refund:[mapParameter:{},token:{}]", JsonUtils.toJson(request.getParameterMap()), request.getHeader("token"));
+        log.info("/amorder/callack/refund:[mapParameter:{},token:{}]", JsonUtils.toJson(request.getParameterMap()), request.getHeader("token"));
         // TODO: 2021/6/13 验签