Merge branch 'master-bug-vehiclemodel-hf'

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberExport.java

@@ -46,6 +46,8 @@ public class BaseUserMemberExport  implements Serializable {
     private Integer beforeDiscount;
     @Column(name = "source")
     private Integer source;
+    @Column(name = "user_id")
+    private Integer userId;
 
 }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java

@@ -79,7 +79,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
     @Cache(key = "user:member{1}")
     public UserMemberVo getMemberInfoByUserId(Integer userId) {
         return mapper.getInfoByUserId(userId);
-    }
+}
 
     //更新会员信息
     @Override
@@ -287,6 +287,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
             baseUserMember.setRentFreeDays(days);
             getMyBiz().updateSelectiveById(baseUserMember);
         }
+
         AppUserVo userVo = detailBiz.getUserInfoById(userId);
         if (userVo != null && (userVo.getIsMember() == null || userVo.getIsMember() == 0)) {
             AppUserVo userVo1 = new AppUserVo();
@@ -309,21 +310,28 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
         mapper.deleteByExample(example);
     }
     private void setModifyData(UserMemberVo beforeMember, BaseUserMember aftereMember) throws Exception {
+
         log.info("保存修改会员记录={}",aftereMember);
         IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+        log.info("token信息={}",infoFromToken);
+        if (beforeMember==null) {
+             beforeMember = new UserMemberVo();
+        }
+        UserMemberVo finalBeforeMember = beforeMember;
         executorService.submit(()->{
             try {
-                AppUserVo qppUser = detailBiz.getUserInfoById(beforeMember.getUserId());
+                AppUserVo qppUser = detailBiz.getUserInfoById(aftereMember.getUserId());
                 BaseUserMemberExport baseUserMemberExport = BaseUserMemberExport
                         .builder()
                         .username(qppUser.getUsername())
-                        .beforeMemberLevel(beforeMember.getMemberLevel())
+                        .beforeMemberLevel(finalBeforeMember.getMemberLevel())
                         .memberLevel(aftereMember.getMemberLevel())
-                        .totalNumber(aftereMember.getTotalNumber() - beforeMember.getTotalNumber())
-                        .rentFreeDays(aftereMember.getRentFreeDays() - beforeMember.getRentFreeDays())
-                        .beforeDiscount(beforeMember.getDiscount())
+                        .totalNumber(aftereMember.getTotalNumber() - (finalBeforeMember.getTotalNumber()==null?0:finalBeforeMember.getTotalNumber()))
+                        .rentFreeDays(aftereMember.getRentFreeDays() - (finalBeforeMember.getRentFreeDays()==null?0:finalBeforeMember.getRentFreeDays()))
+                        .beforeDiscount(finalBeforeMember.getDiscount())
                         .discount(aftereMember.getDiscount())
                         .status(1)
+                        .userId(aftereMember.getUserId())
                         .crtTime(System.currentTimeMillis())
                         .crtId(Integer.valueOf(infoFromToken.getId()))
                         .crtName(infoFromToken.getUniqueName())

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/AppDownloadRecord.java

+package com.xxfc.platform.app.entity;
+
+import lombok.Data;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import java.util.Date;
+
+/**
+ * 下载记录
+ * @author Administrator
+ */
+@Data
+public class AppDownloadRecord {
+
+  @Id
+  @GeneratedValue(generator ="JDBC")
+  private Integer id;
+  private String source;
+  private Date creTime;
+  private String terminal;
+}

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/AppDownloadRecordBiz.java

+package com.xxfc.platform.app.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.app.entity.AppDownloadRecord;
+import com.xxfc.platform.app.mapper.AppDownloadRecordMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author hf
+ * @Date: 2019/12/19 15:47
+ * @Description:
+ */
+@Service
+public class AppDownloadRecordBiz extends BaseBiz<AppDownloadRecordMapper, AppDownloadRecord> {
+
+}

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/mapper/AppDownloadRecordMapper.java

+package com.xxfc.platform.app.mapper;
+
+import com.xxfc.platform.app.entity.AppDownloadRecord;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @Auther: Administrator
+ * @Date: 2019/12/19 15:49
+ * @Description:
+ */
+public interface AppDownloadRecordMapper extends Mapper<AppDownloadRecord> {
+}

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/admin/AppDownloadRecordController.java

+package com.xxfc.platform.app.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.app.biz.AppDownloadRecordBiz;
+import com.xxfc.platform.app.entity.AppDownloadRecord;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+/**
+ * @Auther: Administrator
+ * @Date: 2019/12/19 15:46
+ * @Description:
+ */
+@RestController
+@RequestMapping("/app/unauth/adr")
+public class AppDownloadRecordController extends BaseController<AppDownloadRecordBiz, AppDownloadRecord> {
+    @Override
+    @ApiOperation("添加")
+    @PostMapping(value = "add")
+    public ObjectRestResponse<AppDownloadRecord> add(@RequestBody AppDownloadRecord appDownloadRecord ){
+            appDownloadRecord.setCreTime(new Date());
+            baseBiz.insertSelective(appDownloadRecord);
+
+        return ObjectRestResponse.succ();
+    }
+}

xx-app/xx-app-server/src/main/resources/mapper/AppDownloadRecordMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.xxfc.platform.app.mapper.AppDownloadRecordMapper">
+
+
+</mapper>
\ No newline at end of file