liuchang преди 4 години
родител
ревизия
047d478e60

+ 3 - 1
provider-demo/src/main/java/com/tsf/demo/provider/ProviderApplication.java

@@ -4,11 +4,13 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.tsf.annotation.EnableTsf;
 
 @SpringBootApplication
 @EnableFeignClients // 使用Feign微服务调用时请启用
-//@EnableTsf
+@EnableTsf
+@EnableScheduling
 @ComponentScan(basePackages = {"com.tsf.demo.provider.*"})
 public class ProviderApplication {
     public static void main(String[] args) {

+ 34 - 0
provider-demo/src/main/java/com/tsf/demo/provider/bean/po/MpBehalf.java

@@ -0,0 +1,34 @@
+package com.tsf.demo.provider.bean.po;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+
+/**
+ * 代办实体
+ */
+@Entity
+@Table(name = "mp_behalf")
+@Getter
+@Setter
+public class MpBehalf {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    @Column(name = "identification_id")
+    /**
+     * 代办人实名认证主键
+     */
+    private Long identificationId;
+    /**
+     * 代办人和申领人关系编码
+     */
+    @Column(name = "relation_code")
+    private String relationCode;
+    /**
+     * 代领证件类别 0 身份证 1户口页
+     */
+    @Column(name = "relation_code")
+    private Integer isIDCard;
+}

+ 2 - 0
provider-demo/src/main/java/com/tsf/demo/provider/bean/po/MpMsCardApplicationLog.java

@@ -58,4 +58,6 @@ public class MpMsCardApplicationLog {
             private String updatedBy;
             @Column(name = "updated_time")
             private Timestamp updatedTime;
+            @Column(name = "behalf_id")
+            private Long behalfId;
 }

+ 34 - 0
provider-demo/src/main/java/com/tsf/demo/provider/bean/vo/MpMsCardApplicationLogVO.java

@@ -0,0 +1,34 @@
+package com.tsf.demo.provider.bean.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+@Getter
+@Setter
+public class MpMsCardApplicationLogVO {
+
+    private String id;
+    // varchar(60) DEFAULT NULL COMMENT '用户ID',
+    private Long mpUserId;
+    //varchar(60) DEFAULT NULL COMMENT 'unionid',
+    private String unionid;
+    //varchar(60) DEFAULT NULL COMMENT '收件人',
+    private String name;
+    //varchar(60) DEFAULT NULL COMMENT '手机号',
+    private String mobile;
+    //varchar(60) DEFAULT NULL COMMENT '快递地址',
+    private String address;
+    //varchar(60) DEFAULT NULL COMMENT '发货状态',
+    private Integer expressageStatus;
+    //varchar(60) DEFAULT NULL COMMENT '快递单号',
+    private String courierNumber;
+    //varchar(60) DEFAULT NULL COMMENT '申领方式',(0 网点自取 1 邮递)
+    private Integer method;
+
+    private Long behalfId;
+
+}

+ 3 - 2
provider-demo/src/main/java/com/tsf/demo/provider/controller/LogController.java

@@ -4,6 +4,7 @@ import com.tsf.demo.provider.bean.po.MpMsCardApplicationLog;
 import com.tsf.demo.provider.bean.po.MpMsEcardApplicationLog;
 import com.tsf.demo.provider.bean.po.MpUserIdentification;
 import com.tsf.demo.provider.bean.po.MpUserIdentificationLog;
+import com.tsf.demo.provider.bean.vo.MpMsCardApplicationLogVO;
 import com.tsf.demo.provider.bean.vo.MpUserVO;
 import com.tsf.demo.provider.common.R;
 import com.tsf.demo.provider.service.MpLogService;
@@ -31,8 +32,8 @@ public class LogController {
      */
     @PostMapping("/add/mpMsCardApplicationLog")
     @ApiOperation(value = "新增小程序端实体卡申请日志", notes = "新增小程序端实体卡申请日志")
-    public R add(MpMsCardApplicationLog mpMsCardApplicationLog) {
-        return mpLogService.add(mpMsCardApplicationLog);
+    public R add(MpMsCardApplicationLogVO mpMsCardApplicationLogVO) {
+        return mpLogService.add(mpMsCardApplicationLogVO);
     }
 
     /**

+ 7 - 0
provider-demo/src/main/java/com/tsf/demo/provider/dao/MpBehalfDao.java

@@ -0,0 +1,7 @@
+package com.tsf.demo.provider.dao;
+
+import com.tsf.demo.provider.bean.po.MpBehalf;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface MpBehalfDao extends JpaRepository<MpBehalf,Long> {
+}

+ 2 - 1
provider-demo/src/main/java/com/tsf/demo/provider/service/MpLogService.java

@@ -3,6 +3,7 @@ package com.tsf.demo.provider.service;
 import com.tsf.demo.provider.bean.po.MpMsCardApplicationLog;
 import com.tsf.demo.provider.bean.po.MpMsEcardApplicationLog;
 import com.tsf.demo.provider.bean.po.MpUserIdentificationLog;
+import com.tsf.demo.provider.bean.vo.MpMsCardApplicationLogVO;
 import com.tsf.demo.provider.common.R;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -11,7 +12,7 @@ public interface MpLogService {
     /**
      * 新增小程序端实体卡申请日志
      */
-    public R add(MpMsCardApplicationLog mpMsCardApplicationLog);
+    public R add(MpMsCardApplicationLogVO mpMsCardApplicationLogVO);
 
     /**
      * 新增小程序端电子卡申请日志

+ 9 - 7
provider-demo/src/main/java/com/tsf/demo/provider/service/impl/MpLogServiceImpl.java

@@ -4,6 +4,7 @@ import com.tsf.demo.provider.bean.po.MpMsCardApplicationLog;
 import com.tsf.demo.provider.bean.po.MpMsEcardApplicationLog;
 import com.tsf.demo.provider.bean.po.MpUser;
 import com.tsf.demo.provider.bean.po.MpUserIdentificationLog;
+import com.tsf.demo.provider.bean.vo.MpMsCardApplicationLogVO;
 import com.tsf.demo.provider.common.R;
 import com.tsf.demo.provider.dao.MpMsCardApplicationLogDao;
 import com.tsf.demo.provider.dao.MpMsEcardApplicationLogDao;
@@ -27,7 +28,7 @@ public class MpLogServiceImpl implements MpLogService {
     @Autowired
     private MpUserDao mpUserDao;
     @Override
-    public R add(MpMsCardApplicationLog mpMsCardApplicationLog) {
+    public R add(MpMsCardApplicationLogVO mpMsCardApplicationLog) {
         if(mpMsCardApplicationLog==null){
             return R.fail("数据为空!!");
         }
@@ -60,14 +61,15 @@ public class MpLogServiceImpl implements MpLogService {
                 return R.fail("收货电话不能为空");
             }
         }
-        mpMsCardApplicationLog.setCreatedBy("mp");
-        mpMsCardApplicationLog.setCreatedTime(new Timestamp(System.currentTimeMillis()));
-        mpMsCardApplicationLog.setStatus(0);
-        mpMsCardApplicationLog.setUpdatedBy("mp");
-        mpMsCardApplicationLog.setUpdatedTime(mpMsCardApplicationLog.getCreatedTime());
+        MpMsCardApplicationLog mpMsCardApplicationLogPO = new MpMsCardApplicationLog();
+        mpMsCardApplicationLogPO.setCreatedBy("mp");
+        mpMsCardApplicationLogPO.setCreatedTime(new Timestamp(System.currentTimeMillis()));
+        mpMsCardApplicationLogPO.setStatus(0);
+        mpMsCardApplicationLogPO.setUpdatedBy("mp");
+        mpMsCardApplicationLogPO.setUpdatedTime(mpMsCardApplicationLogPO.getCreatedTime());
         mpMsCardApplicationLog.setUnionid(mpUser.getUnionid());
         try {
-            mpMsCardApplicationLogDao.save(mpMsCardApplicationLog);
+            mpMsCardApplicationLogDao.save(mpMsCardApplicationLogPO);
         } catch (Exception e) {
             e.printStackTrace();
             return R.fail("保存失败");