server/dmmall_service/src/main/java/com/doumee/dao/business/model/Areas.java
@@ -136,58 +136,4 @@ } } /** * 用户信息操作记录表 * @author 江蹄蹄 * @date 2023/03/21 15:17 */ @Data @ApiModel("用户信息操作记录表") @TableName("`member_history`") public static class MemberHistory { @ApiModelProperty(value = "主键", example = "1") @ExcelColumn(name="主键") private Integer id; @ApiModelProperty(value = "创建人编码", example = "1") @ExcelColumn(name="创建人编码") private Integer creator; @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") private Date createDate; @ApiModelProperty(value = "更新人编码", example = "1") @ExcelColumn(name="更新人编码") private Integer editor; @ApiModelProperty(value = "更新时间") @ExcelColumn(name="更新时间") private Date editDate; @ApiModelProperty(value = "是否删除0否 1是", example = "1") @ExcelColumn(name="是否删除0否 1是") private Integer isdeleted; @ApiModelProperty(value = "备注") @ExcelColumn(name="备注") private String remark; @ApiModelProperty(value = "用户编码（关联member表）", example = "1") @ExcelColumn(name="用户编码（关联member表）") private Integer memberId; @ApiModelProperty(value = "类型 0禁用 1启用", example = "1") @ExcelColumn(name="类型 0禁用 1启用") private Integer type; @ApiModelProperty(value = "操作备注") @ExcelColumn(name="操作备注") private String info; } } server/dmmall_service/src/main/java/com/doumee/dao/web/dto/UserCenterVO.java
@@ -17,6 +17,7 @@ @ApiModelProperty(value = "积分规则") private String integralRule; @ApiModelProperty(value = "邀请规则说明") private String invitelRule;
@@ -2141,9 +2141,6 @@ } //加入redis缓存，刷新今天售后编号0开始 RedisUtil.addObject(redisTemplate,Constants.RedisKeys.WITHDRAW_KEY,countWithdraw); }
@@ -48,12 +48,18 @@ ########################微信支付相关配置######################## wx: pay: appId: wxcd2b89fd2ff065f8 appSecret: 3462fa186da7cb06c544df8d8664b63a mchId: 1229817002 mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM notifyUrl: https://test.doumee.cn/dmmall_web_api/web/api/wxPayNotify keyPath: /usr/local/apiclient_cert.p12 #D:\DouMee\dmkjWxcert\apiclient_cert.p12 # appId: wx6264b4f3a697cbe8 appSecret: 23734577e8978138c946b727f0394027 mchId: 1629568742 mchKey: NJTLJSTZYXZRGScaiwubuzichanbu666 notifyUrl: http://xiaopiqiu2.natapp1.cc/web/api/wxPayNotify keyPath: D:\DouMee\gtxljcWxcert\apiclient_cert.p12 # appId: wxcd2b89fd2ff065f8 # appSecret: 3462fa186da7cb06c544df8d8664b63a # mchId: 1229817002 # mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM # notifyUrl: https://test.doumee.cn/dmmall_web_api/web/api/wxPayNotify # keyPath: /usr/local/apiclient_cert.p12 #D:\DouMee\dmkjWxcert\apiclient_cert.p12 # #wx: # pay: @@ -64,6 +70,7 @@ # notifyUrl: http://xiaopiqiu2.natapp1.cc/web/api/wxPayNotify #https://test.doumee.cn/dmmall_web_api/web/api/wxPayNotify # keyPath: D:\DouMee\1739990831_20260306_cert #D:\DouMee\dmkjWxcert\apiclient_cert.p12 # tencent: map: remoteHost: https://apis.map.qq.com server/dmmall_service/src/main/resources/application-pro.yml
@@ -53,7 +53,7 @@ appSecret: 4b5b97d6770f1fc6b09a7019804739a7 mchId: 1739990831 mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM notifyUrl: https://mall.dynometacn.com/dmmall_web_api/web/api/wxPayNotify notifyUrl: https://dynometaie.com/dmmall_web_api/web/api/wxPayNotify keyPath: /usr/local/jars/apiclient_cert.p12 # appId: wxcd2b89fd2ff065f8 # appSecret: 3462fa186da7cb06c544df8d8664b63a server/dmmall_web/src/main/resources/application.yml
@@ -10,7 +10,7 @@ # application: # name: doumeemes profiles: active: pro active: dev # JSON返回配置 jackson:
