微信端人脸照片采集接口开发

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfCreditAccountMapper.java

@@ -19,5 +19,6 @@ import java.util.Date;
  * @date 2024-08-15
  */
 public interface XfCreditAccountMapper extends BaseMapperPlus<XfCreditAccount, XfCreditAccountVo> {
-    Page<WxCreditAccountVo> selectCreditAccountPage(Page page, Long userId, String startTime, String endTime);
+    Page<WxCreditAccountVo> selectCreditAccountPage(Page page,String type, Long userId, String startTime,
+                                                    String endTime);
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/domain/vo/PtUserAccountVo.java

@@ -266,4 +266,14 @@ public class PtUserAccountVo implements Serializable {
      * 租户编号
      */
     private String tenantId;
+
+    /**
+     * 微信二维码使用
+     */
+    //卡流水号
+    private Long cardNo;
+    //商户名称
+    private String customerName;
+    //商户编号
+    private String customerNo;
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/wx/contorller/WxController.java

@@ -1,6 +1,5 @@
 package org.dromara.backstage.wx.contorller;
 
-import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.backstage.payment.domain.vo.PtUserAccountVo;
 import org.dromara.backstage.wx.domain.vo.WxCreditAccountVo;
@@ -12,9 +11,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 微信
@@ -30,7 +30,6 @@ public class WxController extends BaseController {
 
     /**
      * 查询用户账户信息
-     * @param userId
      * @return
      */
     @GetMapping("/getUserInfo")
@@ -41,14 +40,14 @@ public class WxController extends BaseController {
 
     /**
      * 查询账单明细
-     * @param userId
+     * @param type 1 消费，2 充值
      * @return
      */
     @GetMapping("/findCreditAccount")
-    public TableDataInfo<WxCreditAccountVo> findCreditAccount(String startTime, String endTime,
+    public TableDataInfo<WxCreditAccountVo> findCreditAccount(String type, String startTime, String endTime,
                                                               PageQuery pageQuery) {
         Long userId = LoginHelper.getUserId();
-        return wxService.findCreditAccount(userId, startTime, endTime, pageQuery);
+        return wxService.findCreditAccount(type, userId, startTime, endTime, pageQuery);
     }
 
     @PutMapping("/updateCardStatus")

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/wx/service/IWxService.java

@@ -16,7 +16,8 @@ public interface IWxService {
 
     PtUserAccountVo getUserInfoByUserId(Long userId);
 
-    TableDataInfo<WxCreditAccountVo> findCreditAccount(Long userId, String startTime, String endTime, PageQuery pageQuery);
+    TableDataInfo<WxCreditAccountVo> findCreditAccount(String type, Long userId, String startTime, String endTime,
+                                                       PageQuery pageQuery);
 
     boolean updateCardStatus(Long userId, String cardStatus);
 

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/wx/service/impl/WxServiceImpl.java

@@ -66,6 +66,10 @@ public class WxServiceImpl implements IWxService {
     private String userPath;
     @Value("${dzbp.sync-img.url}/")     // 电子班牌照片推送接口
     private String syncImgToDzbpUrl;
+    @Value("${yc.sf.customerName}")
+    private String customerName;
+    @Value("${yc.sf.customerNo}")
+    private String customerNo;
 
     @Override
     public PtUserAccountVo getUserInfoByUserId(Long userId) {
@@ -75,13 +79,26 @@ public class WxServiceImpl implements IWxService {
                 Collectors.toMap(RemoteDictDataVo::getDictValue, RemoteDictDataVo::getDictLabel));
         PtUserAccountVo vo = accountMapper.selectVoById(userId);
         vo.setAccountStatus(dictMap.getOrDefault(vo.getAccountStatus(), ""));
+        //根据userId查询卡片信息
+        PtCard card = cardMapper.selectOne(new LambdaUpdateWrapper<PtCard>()
+            .eq(PtCard::getUserId, userId)
+            .eq(PtCard::getStatus, "1"));
+        if (ObjectUtil.isNotEmpty(card)) {
+          vo.setCardNo(card.getCardNo());
+        }
+        vo.setCustomerName(customerName);
+        vo.setCustomerNo(customerNo);
         return vo;
     }
 
     @Override
-    public TableDataInfo<WxCreditAccountVo> findCreditAccount(Long userId, String startTime, String endTime, PageQuery pageQuery) {
+    public TableDataInfo<WxCreditAccountVo> findCreditAccount(String type, Long userId, String startTime,
+                                                              String endTime,
+                                                              PageQuery pageQuery) {
 
-        return TableDataInfo.build(creditAccountMapper.selectCreditAccountPage(pageQuery.build(), userId, startTime,endTime));
+        return TableDataInfo.build(creditAccountMapper.selectCreditAccountPage(pageQuery.build(), type, userId,
+            startTime,
+            endTime));
     }
 
     @Override

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfCreditAccountMapper.xml

@@ -65,6 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         'CREDITTYPE' AND del_flag = '0' ) dict ON a.credit_type = dict.dict_value
                     WHERE
                         a.user_id = #{userId} AND del_flag = '0'
+                        <if test="type != null and type == '1'">
+                            AND false
+                        </if>
                 ) UNION ALL
                 (
                     SELECT
@@ -77,6 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         t_xf_consumedetail b
                     WHERE
                         b.user_id = #{userId} AND del_flag = '0'
+                    <if test="type != null and type == '2'">
+                        AND false
+                    </if>
                 )
             ) temp
         <where>