4/10 建立订单表，人员关注产品表

src/main/java/com/example/xiaoshiweixinback/business/utils/DateUtils.java

@@ -2,9 +2,10 @@ package com.example.xiaoshiweixinback.business.utils;
 
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.DateTime;
+
 
 import com.example.xiaoshiweixinback.entity.dto.patent.Calculate;
+import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,21 +68,7 @@ public class DateUtils {
     private DateUtils() {
     }
 
-    public static Integer getWeek(String beginDateStr, String endDateStr, String date) {
-        DateTime beginDate = DateUtil.parseDate(beginDateStr);
-        DateTime endDate = DateUtil.parseDate(endDateStr);
-        DateTime currentDate = DateUtil.parseDate(date);
-        int week = 1;
-        if (DateUtil.isIn(currentDate, beginDate, endDate)) {
-            Date endDateOfWeek = DateUtil.endOfWeek(beginDate);
-            while (!DateUtil.isIn(currentDate, beginDate, endDateOfWeek)) {
-                ++week;
-                endDateOfWeek = DateUtil.endOfWeek(DateUtil.offsetDay(endDateOfWeek, 1));
-            }
-            return week;
-        }
-        return -1;
-    }
+
 
     public static boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) {
         Calendar date = Calendar.getInstance();
@@ -731,6 +718,25 @@ public class DateUtils {
         return (int) timeStamp;
     }
 
+    /**
+     * 获取几天之后的日期
+     *
+     * @param date yyyy-MM-dd HH:mm:ss
+     * @param   加减的天数
+     */
+    public static Date getPlusMonthDate(Date date, int month) {
+        Calendar cal = Calendar.getInstance();
+        try {
+            cal.setTime(date);
+            cal.add(Calendar.MONTH, month);
+            return cal.getTime();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
     public static void main(String[] args) {
         System.out.println(12%50);
     }

src/main/java/com/example/xiaoshiweixinback/controller/PayController.java

@@ -4,14 +4,12 @@ import com.example.xiaoshiweixinback.business.common.Constants;
 import com.example.xiaoshiweixinback.business.common.Response;
 import com.example.xiaoshiweixinback.business.common.base.Records;
 import com.example.xiaoshiweixinback.entity.weixinPay.GetPayTicketVO;
+import com.example.xiaoshiweixinback.entity.weixinPay.WeiXinPayDTO;
 import com.example.xiaoshiweixinback.service.VipService;
 import com.example.xiaoshiweixinback.service.weixinpay.WeixinPayService;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 @RequestMapping(Constants.XIAOSHI_WEIXINBACK + "/weixinpay")
@@ -29,11 +27,11 @@ public class PayController {
 
 
     @Operation(summary = "下单并获取订单信息")
-    @GetMapping("/getPayTickets")
-    private Response getPayTickets() {
+    @PostMapping("/getPayTickets")
+    private Response getPayTickets(@RequestBody WeiXinPayDTO weiXinPayDTO) {
         Records records = new Records();
         try {
-            GetPayTicketVO getPayTicketVO = weixinPayService.getPayTickets();
+            GetPayTicketVO getPayTicketVO = weixinPayService.getPayTickets(weiXinPayDTO);
             records.setData(getPayTicketVO);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/example/xiaoshiweixinback/domain/AssoPersonFunction.java

@@ -0,0 +1,51 @@
+package com.example.xiaoshiweixinback.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 人员功能关联表
+ * @TableName asso_person_function
+ */
+@TableName(value ="asso_person_function")
+@Data
+public class AssoPersonFunction extends BaseEntity<AssoPersonFunction> {
+    /**
+     * ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 
+     */
+    private String personUuid;
+
+    /**
+     * 
+     */
+    private String functionUuid;
+
+    /**
+     * 
+     */
+    private Date expiryTime;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private String functionParameter;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/example/xiaoshiweixinback/domain/AssoPersonVip.java

@@ -1,11 +1,14 @@
 package com.example.xiaoshiweixinback.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
+
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
 import lombok.Data;
+import org.joda.time.DateTime;
+
+import java.util.Date;
+
 
 /**
  * 人员会员管理表
@@ -23,11 +26,13 @@ public class AssoPersonVip extends BaseEntity<AssoPersonVip> {
     /**
      * 
      */
-    private Integer personId;
+    private String personUuid;
 
     /**
      * 
      */
-    private Integer vipId;
+    private String vipUuid;
 
+    private Date createTime;
+    private Date expiryTime;
 }

src/main/java/com/example/xiaoshiweixinback/domain/AssoVipFunction.java

@@ -0,0 +1,36 @@
+package com.example.xiaoshiweixinback.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+/**
+ * vip功能关联表
+ *
+ * @TableName asso_vip_function
+ */
+@TableName(value = "asso_vip_function")
+@Data
+public class AssoVipFunction extends BaseEntity<AssoVipFunction> {
+    /**
+     * ID
+     */
+    private Integer id;
+
+    /**
+     *
+     */
+    private String vipUuid;
+
+    /**
+     *
+     */
+    private String functionUuid;
+    private String functionParameter;
+
+}

src/main/java/com/example/xiaoshiweixinback/domain/Order.java

@@ -60,6 +60,7 @@ public class Order extends BaseEntity<Order> {
      */
     private String personUuid;
 
+    private Integer goodCount;
     /**
      * 
      */

src/main/java/com/example/xiaoshiweixinback/domain/Vip.java

@@ -4,14 +4,17 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+
 import lombok.Data;
 
 /**
  * 会员表
+ *
  * @TableName vip
  */
-@TableName(value ="vip")
+@TableName(value = "vip")
 @Data
 public class Vip extends BaseEntity<Vip> {
     /**
@@ -21,14 +24,15 @@ public class Vip extends BaseEntity<Vip> {
     private Integer id;
 
     /**
-     * 
+     *
      */
     private Integer vipType;
 
     /**
-     * 
+     *
      */
     private String name;
-
-
+    private String vipUuId;
+    private Integer lastTime;
+    private Double price;
 }

src/main/java/com/example/xiaoshiweixinback/entity/weixinPay/WeiXinPayDTO.java

@@ -4,4 +4,7 @@ import lombok.Data;
 
 @Data
 public class WeiXinPayDTO {
+    private Integer goodType;
+    private String goodUuid;
+    private Integer count;
 }

src/main/java/com/example/xiaoshiweixinback/mapper/AssoPersonFunctionMapper.java

@@ -0,0 +1,18 @@
+package com.example.xiaoshiweixinback.mapper;
+
+import com.example.xiaoshiweixinback.domain.AssoPersonFunction;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author admin
+* @description 针对表【asso_person_function(人员功能关联表)】的数据库操作Mapper
+* @createDate 2024-04-10 23:08:39
+* @Entity xiaoshiweixinback.domain.AssoPersonFunction
+*/
+public interface AssoPersonFunctionMapper extends BaseMapper<AssoPersonFunction> {
+
+}
+
+
+
+

src/main/java/com/example/xiaoshiweixinback/mapper/AssoPersonProductMapper.java

@@ -2,7 +2,6 @@ package com.example.xiaoshiweixinback.mapper;
 
 import com.example.xiaoshiweixinback.domain.AssoPersonProduct;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import jdk.jfr.Registered;
 import org.springframework.stereotype.Repository;
 
 /**

src/main/java/com/example/xiaoshiweixinback/mapper/AssoVipFunctionMapper.java

@@ -0,0 +1,20 @@
+package com.example.xiaoshiweixinback.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.xiaoshiweixinback.domain.AssoVipFunction;
+import org.springframework.stereotype.Repository;
+
+/**
+* @author admin
+* @description 针对表【asso_vip_function(vip功能关联表)】的数据库操作Mapper
+* @createDate 2024-04-10 21:35:25
+* @Entity xiaoshiweixinback.domain.AssoVipFunction
+*/
+@Repository
+public interface AssoVipFunctionMapper extends BaseMapper<AssoVipFunction> {
+
+}
+
+
+
+

src/main/java/com/example/xiaoshiweixinback/service/AssoPersonFunctionService.java

@@ -0,0 +1,21 @@
+package com.example.xiaoshiweixinback.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.xiaoshiweixinback.domain.AssoPersonFunction;
+
+import com.example.xiaoshiweixinback.mapper.AssoPersonFunctionMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author admin
+* @description 针对表【asso_person_function(人员功能关联表)】的数据库操作Service实现
+* @createDate 2024-04-10 23:08:39
+*/
+@Service
+public class AssoPersonFunctionService extends ServiceImpl<AssoPersonFunctionMapper, AssoPersonFunction> {
+
+}
+
+
+
+

src/main/java/com/example/xiaoshiweixinback/service/AssoPersonVipService.java

@@ -1,19 +1,50 @@
 package com.example.xiaoshiweixinback.service;
 
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.xiaoshiweixinback.business.utils.DateUtils;
 import com.example.xiaoshiweixinback.domain.AssoPersonVip;
+import com.example.xiaoshiweixinback.domain.Vip;
 import com.example.xiaoshiweixinback.mapper.AssoPersonVipMapper;
+import org.joda.time.DateTime;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
-* @author admin
-* @description 针对表【asso_person_vip(人员会员管理表)】的数据库操作Service实现
-* @createDate 2024-03-29 15:32:20
-*/
+ * @author admin
+ * @description 针对表【asso_person_vip(人员会员管理表)】的数据库操作Service实现
+ * @createDate 2024-03-29 15:32:20
+ */
 @Service
-public class AssoPersonVipService extends ServiceImpl<AssoPersonVipMapper, AssoPersonVip>
-    {
+public class AssoPersonVipService extends ServiceImpl<AssoPersonVipMapper, AssoPersonVip> {
+
+    public Date getCreateTime(String personUuid) {
+        Date date = new Date();
+        LambdaQueryWrapper<AssoPersonVip> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AssoPersonVip::getPersonUuid, personUuid)
+                .gt(AssoPersonVip::getExpiryTime, date)
+                .orderByDesc(AssoPersonVip::getExpiryTime);
+        AssoPersonVip assoPersonVip = this.getOne(queryWrapper, false);
+        if (assoPersonVip != null) {
+            date = assoPersonVip.getExpiryTime();
+        }
+        return date;
+    }
 
+    public AssoPersonVip addAssoPersonVip(String personUuid, Vip vip) {
+        Date date = this.getCreateTime(personUuid);
+        AssoPersonVip assoPersonVip = new AssoPersonVip();
+        assoPersonVip.setCreateTime(date);
+        Integer lastTime =vip.getLastTime();
+       Date expiryDate = DateUtils.getPlusMonthDate(date,lastTime);
+        assoPersonVip.setExpiryTime(expiryDate);
+        assoPersonVip.setVipUuid(vip.getVipUuId());
+        assoPersonVip.setPersonUuid(personUuid);
+        assoPersonVip.insert();
+        return assoPersonVip;
+    }
 }
 
 

src/main/java/com/example/xiaoshiweixinback/service/AssoVipFunctionService.java

@@ -0,0 +1,35 @@
+package com.example.xiaoshiweixinback.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.xiaoshiweixinback.domain.AssoVipFunction;
+
+import com.example.xiaoshiweixinback.mapper.AssoVipFunctionMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @description 针对表【asso_vip_function(vip功能关联表)】的数据库操作Service实现
+ * @createDate 2024-04-10 21:35:25
+ */
+@Service
+public class AssoVipFunctionService extends ServiceImpl<AssoVipFunctionMapper, AssoVipFunction> {
+
+    public List<AssoVipFunction> getVipFunctionByVipUuid(String vipUuId) {
+        LambdaQueryWrapper<AssoVipFunction> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AssoVipFunction::getVipUuid, vipUuId);
+        List<AssoVipFunction> assoVipFunctions = this.list(queryWrapper);
+
+        return assoVipFunctions;
+
+
+    }
+
+
+}
+
+
+
+

src/main/java/com/example/xiaoshiweixinback/service/OrderService.java

@@ -1,12 +1,22 @@
 package com.example.xiaoshiweixinback.service;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.xiaoshiweixinback.business.utils.BatchNoUtil;
 import com.example.xiaoshiweixinback.domain.AssoPersonProduct;
 
 import com.example.xiaoshiweixinback.domain.Order;
+import com.example.xiaoshiweixinback.domain.Vip;
+import com.example.xiaoshiweixinback.entity.weixinPay.GetPayTicketVO;
+import com.example.xiaoshiweixinback.entity.weixinPay.JsApiDTO;
+import com.example.xiaoshiweixinback.entity.weixinPay.WeiXinPayDTO;
 import com.example.xiaoshiweixinback.mapper.AssoPersonProductMapper;
 import com.example.xiaoshiweixinback.mapper.OrderMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author admin
@@ -15,5 +25,44 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class OrderService extends ServiceImpl<OrderMapper, Order> {
+    @Autowired
+    @Lazy
+    private VipService vipService;
 
+    @Transactional(rollbackFor = Exception.class)
+    public Order addOrder(WeiXinPayDTO weiXinPayDTO, GetPayTicketVO getPayTicketVO, JsApiDTO jsApiDTO) {
+        Integer type = weiXinPayDTO.getGoodType();
+        String uuid = weiXinPayDTO.getGoodUuid();
+
+
+        Order order = new Order();
+        order.setOrderState(0);
+        order.setTradeNo(jsApiDTO.getOut_trade_no());
+
+        String json = JSONObject.toJSONString(getPayTicketVO);
+
+        switch (type) {
+            case 1:
+                Vip vip = vipService.getVipByUuId(uuid);
+                order.setOrgPrice(vip.getPrice());
+                order.setTruePrice(vip.getPrice());
+                order.setGoodsType(type);
+                order.setGoodUuid(uuid);
+                order.setOrderParameter(json);
+                break;
+
+        }
+        order.insert();
+        return order;
+    }
+
+
+    public Order getOrderByTradeNo(String tradeNo) {
+        LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Order::getTradeNo, tradeNo);
+        Order order = this.getOne(queryWrapper);
+        return order;
+
+
+    }
 }

src/main/java/com/example/xiaoshiweixinback/service/VipService.java

@@ -3,10 +3,13 @@ package com.example.xiaoshiweixinback.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.xiaoshiweixinback.business.common.base.Records;
-import com.example.xiaoshiweixinback.domain.Vip;
+import com.example.xiaoshiweixinback.domain.*;
 import com.example.xiaoshiweixinback.mapper.VipMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -16,9 +19,19 @@ import java.util.List;
  */
 @Service
 public class VipService extends ServiceImpl<VipMapper, Vip> {
+    @Autowired
+    @Lazy
+    private OrderService orderService;
+    @Autowired
+    private AssoVipFunctionService assoVipFunctionService;
+    @Autowired
+    private AssoPersonVipService assoPersonVipService;
+    @Autowired
+    private AssoPersonFunctionService assoPersonFunctionService;
 
     /**
      * 查询会员
+     *
      * @return
      */
     public Records getAllVip() {
@@ -30,11 +43,34 @@ public class VipService extends ServiceImpl<VipMapper, Vip> {
         return records;
     }
 
-    public void getVip(){
-
+    public Vip getVipByUuId(String uuid) {
+        LambdaQueryWrapper<Vip> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Vip::getVipUuId, uuid);
+        Vip vip = this.getOne(queryWrapper);
+        return vip;
 
+    }
 
 
+    public void activateVIP(String tradeNo) {
+        Order order = orderService.getOrderByTradeNo(tradeNo);
+        String uuid = order.getGoodUuid();
+        String personUuId = order.getPersonUuid();
+        Vip vip = this.getVipByUuId(uuid);
+        AssoPersonVip assoPersonVip = assoPersonVipService.addAssoPersonVip(personUuId, vip);
+        //查询vip相关权益
+        List<AssoVipFunction> assoVipFunctions = assoVipFunctionService.getVipFunctionByVipUuid(uuid);
+        //将权益赋值给人员
+        List<AssoPersonFunction> assoPersonFunctions = new ArrayList<>();
+        assoVipFunctions.forEach(item -> {
+            AssoPersonFunction assoPersonFunction = new AssoPersonFunction();
+            assoPersonFunction.setFunctionUuid(item.getFunctionUuid());
+            assoPersonFunction.setExpiryTime(assoPersonVip.getExpiryTime());
+            assoPersonFunction.setCreateTime(assoPersonVip.getCreateTime());
+            assoPersonFunction.setFunctionParameter(item.getFunctionParameter());
+            assoPersonFunctions.add(assoPersonFunction);
+        });
+        assoPersonFunctionService.saveBatch(assoPersonFunctions);
     }
 }
 

src/main/java/com/example/xiaoshiweixinback/service/weixinpay/WeixinPayService.java

@@ -10,6 +10,8 @@ import com.example.xiaoshiweixinback.entity.vo.PersonnelVO;
 import com.example.xiaoshiweixinback.entity.weixinPay.GetAuthorizationVO;
 import com.example.xiaoshiweixinback.entity.weixinPay.GetPayTicketVO;
 import com.example.xiaoshiweixinback.entity.weixinPay.JsApiDTO;
+import com.example.xiaoshiweixinback.entity.weixinPay.WeiXinPayDTO;
+import com.example.xiaoshiweixinback.service.OrderService;
 import com.google.gson.Gson;
 import okhttp3.*;
 import org.springframework.beans.BeanUtils;
@@ -30,6 +32,8 @@ public class WeixinPayService {
     private AuthorizationService authorizationService;
     @Autowired
     private CacheUtil cacheUtil;
+    @Autowired
+    private OrderService orderService;
     public static String merchantId = "1673179188";
     /**
      * appId
@@ -43,7 +47,7 @@ public class WeixinPayService {
      * @return
      * @throws Exception
      */
-    public GetPayTicketVO getPayTickets() throws Exception {
+    public GetPayTicketVO getPayTickets(WeiXinPayDTO weiXinPayDTO) throws Exception {
         GetPayTicketVO getPayTicketVO = new GetPayTicketVO();
         String url = "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi";
         JsApiDTO jsApiDTO = new JsApiDTO();
@@ -84,6 +88,9 @@ public class WeixinPayService {
                 String a = Objects.requireNonNull(response.body()).string();
                 JSONObject jsonObject = JSONObject.parseObject(a);
                 getPayTicketVO.setPrepayId(jsonObject.get("prepay_id").toString());
+
+                orderService.addOrder(weiXinPayDTO,getPayTicketVO,jsApiDTO);
+
                 return getPayTicketVO;
             }