Merge remote-tracking branch 'origin/zcc'

src/main/java/com/peanut/modules/common/controller/UserAddressController.java

@@ -78,7 +78,7 @@ public class UserAddressController {
     /**
      * 删除用户地址
      */
-    @RequestMapping(value = "/delete", method = RequestMethod.GET)
+    @RequestMapping(value = "/delete")
     public R delete(@RequestParam("id") Integer id) {
         userAddressService.removeById(id);
         return R.ok();

src/main/java/com/peanut/modules/common/dao/JfTransactionDetailsDao.java

@@ -0,0 +1,9 @@
+package com.peanut.modules.common.dao;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.peanut.modules.common.entity.JfTransactionDetails;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface JfTransactionDetailsDao extends MPJBaseMapper<JfTransactionDetails> {
+}

src/main/java/com/peanut/modules/common/entity/JfTransactionDetails.java

@@ -0,0 +1,48 @@
+package com.peanut.modules.common.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@TableName("jf_transaction_details")
+public class JfTransactionDetails implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private Integer id;
+    /**
+     * 用户id
+     */
+    private Integer userId;
+    /**
+     * 0增加1减少
+     */
+    private String actType;
+    /**
+     * 变动金额
+     */
+    private BigDecimal changeAmount;
+    /**
+     * 余额
+     */
+    private BigDecimal userBalance;
+    /**
+     * 关联id
+     */
+    private Integer relationId;
+    /**
+     * 备注
+     */
+    private String remark;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @TableLogic
+    private Integer delFlag;
+
+}

src/main/java/com/peanut/modules/common/service/JfTransactionDetailsService.java

@@ -0,0 +1,9 @@
+package com.peanut.modules.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.peanut.modules.common.entity.JfTransactionDetails;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface JfTransactionDetailsService extends IService<JfTransactionDetails> {
+}

src/main/java/com/peanut/modules/common/service/impl/JfTransactionDetailsServiceImpl.java

@@ -0,0 +1,11 @@
+package com.peanut.modules.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.peanut.modules.common.dao.JfTransactionDetailsDao;
+import com.peanut.modules.common.entity.JfTransactionDetails;
+import com.peanut.modules.common.service.JfTransactionDetailsService;
+import org.springframework.stereotype.Service;
+
+@Service("commonJfTransactionDetailsService")
+public class JfTransactionDetailsServiceImpl extends ServiceImpl<JfTransactionDetailsDao, JfTransactionDetails> implements JfTransactionDetailsService {
+}