4/10 登录修改

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

@@ -20,7 +20,19 @@ public class BatchNoUtil {
         // 返回分配批次
         return "PTX"+currentTimeStr + cusCodeStr;
 
+    }
+
+    public static String getOrderNo(){
+        // 批次号第一部分：时间
+        DateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+        String currentTimeStr = dateFormat.format(new Date());
 
+        // 批次号第二部分：随机数
+        Random random = new Random();
+        Integer cusCode = random.nextInt(900000) + 100000;
+        String cusCodeStr = cusCode.toString();
 
+        // 返回分配批次
+        return "ORT"+currentTimeStr + cusCodeStr;
     }
 }

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

@@ -0,0 +1,55 @@
+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 lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 检索记录表
+ * @TableName search_record
+ */
+@TableName(value ="search_record")
+@Data
+public class SearchRecord extends BaseEntity<SearchRecord> {
+    /**
+     * ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 产品id
+     */
+    private Integer productId;
+
+    /**
+     * 检索条件
+     */
+    private String searchCondition;
+
+    /**
+     * 
+     */
+    private Integer allNum;
+
+    /**
+     * 检索时间
+     */
+    private Date searchTime;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String personUuid;
+
+}

src/main/java/com/example/xiaoshiweixinback/entity/vo/PersonnelVO.java

@@ -7,4 +7,5 @@ public class PersonnelVO {
     private String uuid;
     private Integer id;
     private Integer personType;
+    private String openId;
 }

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

@@ -0,0 +1,7 @@
+package com.example.xiaoshiweixinback.entity.weixinPay;
+
+import lombok.Data;
+
+@Data
+public class WeiXinPayDTO {
+}

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

@@ -0,0 +1,20 @@
+package com.example.xiaoshiweixinback.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.xiaoshiweixinback.domain.SearchRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+* @author admin
+* @description 针对表【search_record(检索记录表)】的数据库操作Mapper
+* @createDate 2024-04-10 15:11:31
+* @Entity xiaoshiweixinback.domain.SearchRecord
+*/
+@Repository
+public interface SearchRecordMapper extends BaseMapper<SearchRecord> {
+
+}
+
+
+
+

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

@@ -0,0 +1,22 @@
+package com.example.xiaoshiweixinback.service;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.xiaoshiweixinback.domain.SearchRecord;
+
+import com.example.xiaoshiweixinback.mapper.SearchRecordMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author admin
+* @description 针对表【search_record(检索记录表)】的数据库操作Service实现
+* @createDate 2024-04-10 15:11:31
+*/
+@Service
+public class SearchRecordService extends ServiceImpl<SearchRecordMapper, SearchRecord> {
+
+}
+
+
+
+

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

@@ -29,6 +29,13 @@ public class VipService extends ServiceImpl<VipMapper, Vip> {
         records.setData(vipList);
         return records;
     }
+
+    public void getVip(){
+
+
+
+
+    }
 }
 
 

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

@@ -3,7 +3,10 @@ package com.example.xiaoshiweixinback.service.weixinpay;
 import com.alibaba.fastjson.JSONObject;
 import com.example.xiaoshiweixinback.business.config.XDns;
 import com.example.xiaoshiweixinback.business.utils.BatchNoUtil;
+import com.example.xiaoshiweixinback.business.utils.CacheUtil;
 import com.example.xiaoshiweixinback.business.utils.FormatUtil;
+import com.example.xiaoshiweixinback.business.utils.LoginUtils;
+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;
@@ -25,6 +28,8 @@ public class WeixinPayService {
      */
     @Autowired
     private AuthorizationService authorizationService;
+    @Autowired
+    private CacheUtil cacheUtil;
     public static String merchantId = "1673179188";
     /**
      * appId
@@ -45,7 +50,7 @@ public class WeixinPayService {
         jsApiDTO.setAppid(appId);
         jsApiDTO.setDescription("会员");
         jsApiDTO.setMchid(merchantId);
-        String tradeNo = BatchNoUtil.getBatchNo();
+        String tradeNo = BatchNoUtil.getOrderNo();
         jsApiDTO.setOut_trade_no(tradeNo);
         JsApiDTO.Amount amount = new JsApiDTO.Amount();
         amount.setCurrency("CNY");
@@ -53,7 +58,8 @@ public class WeixinPayService {
         jsApiDTO.setAmount(amount);
         JsApiDTO.Payer payer = new JsApiDTO.Payer();
         jsApiDTO.setNotify_url("https://xsip.cn/xiaoshi-weixinback/weixinpay/success");
-        payer.setOpenid("oM10C7USCn1yqeZTrRVwnfMnrxzE");
+        PersonnelVO personnelVO = cacheUtil.getLoginUser(LoginUtils.getToken());
+        payer.setOpenid(personnelVO.getOpenId());
         jsApiDTO.setPayer(payer);
         OkHttpClient okHttpClient = new OkHttpClient();
         String param = new Gson().toJson(jsApiDTO);