会员卡购买详情接口

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VipCardRecordController.java

@@ -24,10 +24,10 @@ public class VipCardRecordController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail/{id}")
+    @GetMapping("/detail/{orderDetilId")
     @ApiOperation(value = "详情", notes = "传入id")
-    public HttpResponseResult<VipCardRecordVo> detail(@PathVariable("id") Long id) {
-    	return succeed(vipCardRecordService.detail(id));
+    public HttpResponseResult<VipCardRecordVo> detail(@PathVariable("orderDetilId") Long orderDetilId) {
+    	return succeed(vipCardRecordService.detail(orderDetilId));
 	}
     
     /**

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VipCardRecordDao.java

@@ -11,6 +11,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.VipCardRecordSearch;
 
 
 public interface VipCardRecordDao extends BaseMapper<VipCardRecord> {
+
     /**
      * 查询详情
      *
@@ -18,7 +19,7 @@ public interface VipCardRecordDao extends BaseMapper<VipCardRecord> {
      * @date 2022-03-30 13:53:51
      * @return: com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo
      */
-    VipCardRecordVo detail(@Param("id") Long id, @Param("userId") Long userId);
+    VipCardRecordVo detail(@Param("orderDetilId") Long orderDetilId, @Param("userId") Long userId);
 
     /**
      * 分页查询
@@ -44,4 +45,5 @@ public interface VipCardRecordDao extends BaseMapper<VipCardRecord> {
      * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo>
      */
     List<VipCardRecordVo> selectExpireRecord();
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VipCardRecordService.java

@@ -12,34 +12,41 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 
 /**
  * 购买会员卡记录表 服务类
+ *
  * @author liweifan
  * @date 2022-03-30
  */
-public interface VipCardRecordService extends IService<VipCardRecord>  {
-	/**
-	 * 查询详情
-	 * @author liweifan
-	 * @date 2022-03-30
-	 */
-	VipCardRecordVo detail(Long id);
-	/**
+public interface VipCardRecordService extends IService<VipCardRecord> {
+    /**
+     * 查询详情
+     *
+     * @author liweifan
+     * @date 2022-03-30
+     */
+    VipCardRecordVo detail(Long orderDetilId);
+
+    /**
      * 查询详情
+     *
      * @author liweifan
- 	 * @date 2022-03-30
+     * @date 2022-03-30
      */
-	VipCardRecordVo detail(Long id,Long userId);
+    VipCardRecordVo detail(Long orderDetilId, Long userId);
 
     /**
      * 分页查询
+     *
      * @author liweifan
- 	 * @date 2022-03-30
+     * @date 2022-03-30
      */
     IPage<VipCardRecordVo> selectPage(IPage<VipCardRecordVo> page, VipCardRecordSearch query);
 
-	/***
-	 * 会员卡到期提醒
-	 * @author liweifan
-	 * @updateTime 2022/5/5 19:28
-	 */
-	void pollExpireMsg();
+    /***
+     * 会员卡到期提醒
+     * @author liweifan
+     * @updateTime 2022/5/5 19:28
+     */
+    void pollExpireMsg();
+
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VipCardRecordServiceImpl.java

@@ -32,15 +32,13 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
     private SysMessageService sysMessageService;
 
     @Override
-    public VipCardRecordVo detail(Long id) {
-        VipCardRecordVo detail = baseMapper.detail(id, null);
-        return detail;
+    public VipCardRecordVo detail(Long orderDetilId) {
+        return baseMapper.detail(orderDetilId, null);
     }
 
     @Override
-    public VipCardRecordVo detail(Long id, Long userId) {
-        VipCardRecordVo detail =  baseMapper.detail(id, userId);
-        return detail;
+    public VipCardRecordVo detail(Long orderDetilId, Long userId) {
+        return baseMapper.detail(orderDetilId, userId);
     }
 
     @Override

cooleshow-user/user-biz/src/main/resources/config/mybatis/VipCardRecordMapper.xml

@@ -34,18 +34,24 @@
             s.original_price_ as originalPrice,
             s.sale_price_ as salePrice,
             s.period_ as `period`
-        FROM vip_card_record t
+        FROM user_order_detail a
+        left join vip_card_record t on a.order_no_ = t.order_no_ and a.sub_order_no_ = t.sub_order_no_
         left join member_price_settings s on t.vip_card_id_ = s.id_
-        where t.id_ = #{id}
+        where a.id_ = #{orderDetilId}
         <if test="userId != null">
             and t.user_id_ = #{userId}
         </if>
     </select>
-    
+
+
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo">
 		SELECT         
-        	<include refid="baseColumns" />
+        	<include refid="baseColumns" />,
+            s.original_price_ as originalPrice,
+            s.sale_price_ as salePrice,
+            s.period_ as `period`
 		FROM vip_card_record t
+        left join member_price_settings s on t.vip_card_id_ = s.id_
         order by t.create_time_ desc
 	</select>
 

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/VipCardRecordController.java

@@ -35,14 +35,14 @@ public class VipCardRecordController extends BaseController {
     /**
      * 查询单条
      */
-    @GetMapping("/detail/{id}")
+    @GetMapping("/detail/{orderDetilId}")
     @ApiOperation(value = "详情", notes = "传入id")
-    public HttpResponseResult<VipCardRecordVo> detail(@PathVariable("id") Long id) {
+    public HttpResponseResult<VipCardRecordVo> detail(@PathVariable("orderDetilId") Long orderDetilId) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        return succeed(vipCardRecordService.detail(id, user.getId()));
+        return succeed(vipCardRecordService.detail(orderDetilId, user.getId()));
     }
 
     /**

toolset/toolset-payment/src/main/resources/apiclient_cert.pem

@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID8zCCAtugAwIBAgIUXkiyBI0+OOmO2K35AnprC9vhf8kwDQYJKoZIhvcNAQEL
-BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
-FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMjIwNTE2MDcxNzE5WhcNMjcwNTE1MDcxNzE5WjCBhDETMBEGA1UEAwwK
-MTYyNTkzMDAzNDEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTAwLgYDVQQL
-DCfmrabmsYnphbfkuZDnp4DnvZHnu5znp5HmioDmnInpmZDlhazlj7gxCzAJBgNV
-BAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANAWcWJgjzWHrqjxidhyekmBXOTj54lHYkggJC1esX1AwEISOk1E
-edbsw4OVvUZJcyg6pu/vmLTgNZSoCQ2fuiWhTXg5BeMBRN/UejSQFDRVSCfsAnkY
-Xx2eGMKvLWD8Z8VGBtM7nCfb18EGe35vyNtj2v/9o/8hv/cUoGGccFY21gYxiJAQ
-sEKwRjz1hgmahgSOYnb4GQRLbKKPwzToo7oVeKnAjRHQ8wr/+shCjIFGiPXHcIha
-DcU/Wz6StHMp54m9E7cvyHoNK4jlSHjNqWdBZPKzaYx+sozsZD9rZQGjB6l5h3RU
-kU4PaIe+g06FCEp1Yw7eaoTVCM3j+dhVvRcCAwEAAaOBgTB/MAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0cnVz
-LmNvbS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQz
-OTc1NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEAS3D2jC435T13
-PRYgNceYidbnds+cHWT7e8YJZl5aKNzGY8mCxuGPrmNHblUOfeq0V4cfoSlh/RCv
-8kgKI3a5z6ZvFhuZ9CITKELkuV9ClQIiMveJkxcU68giR7GY68kesZRDYeM2lVCk
-sSOzKjfXbZX30OhDM24vcVD2z6/y/XVoB7MOY8PcrdFT3hRnP1u+3lUXQGijLkMY
-szU6yX4NSac7OSaKNwaJNMqpuHM1uAd6NM4qTQ0oXuwN+uOR0+GCgrUkM/34MPsm
-P/o8TmyqzwJl12k9RNwqlGBem5re08vxrDTnEaZG5NklV8GFmxGyToo+4foueunk
-22KIeOpo6g==
------END CERTIFICATE-----

toolset/toolset-payment/src/main/resources/apiclient_key.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDQFnFiYI81h66o
-8YnYcnpJgVzk4+eJR2JIICQtXrF9QMBCEjpNRHnW7MODlb1GSXMoOqbv75i04DWU
-qAkNn7oloU14OQXjAUTf1Ho0kBQ0VUgn7AJ5GF8dnhjCry1g/GfFRgbTO5wn29fB
-Bnt+b8jbY9r//aP/Ib/3FKBhnHBWNtYGMYiQELBCsEY89YYJmoYEjmJ2+BkES2yi
-j8M06KO6FXipwI0R0PMK//rIQoyBRoj1x3CIWg3FP1s+krRzKeeJvRO3L8h6DSuI
-5Uh4zalnQWTys2mMfrKM7GQ/a2UBowepeYd0VJFOD2iHvoNOhQhKdWMO3mqE1QjN
-4/nYVb0XAgMBAAECggEAPHN4pwrEL9nl/MCGujGvovEI6pnm5rOtMqTbva53w5pv
-AALJmy7ccnq/5dc3cFbgNHytiKDDbTCBgFk8oA+aBVqR5e4y7pqsxpW0ltaQeA+a
-cbaXlVRmNXV7XfuEJFvPTbklPHJh0BaG3FWkxLt2z3133sxxuymz2fTNDu5imDi5
-zmwQ0+WHy955jPOsE726Vnef76PtOxYdZip0QigXeVTr715ohsxPQ+sXyNYMpYsF
-k5A19IkGSYqCzQpyDCA1dDKiAQQQ9Ikh34/B/lOkfOI/Ivf1YTSVjj/XsRd6RW3V
-CQWx7MKTXFE3U/dxragu98ejYmaT5DL9/G5Yptx1kQKBgQDvLLCp0iT5sCCrisH+
-f8fLfvCgUE+MuVYyvFMcps+b/eXaF7SjESqqYgpB2U32vJiCzk760yMFGR7zeoRs
-eUPT0SYIKgm8+t4DnaMBxIarDbgU+KvVlYQR7n1tqf8f2InTWbq/KCVzt+fCP6gO
-vjHUEB2m22pKomGTrNYNQaWxXwKBgQDeueglZsx7Z4QyRKBLYAIqUtFD0kysMz9x
-KLPwRZCceFF8jEl4vk8Ldrvhn0oiz0sPKyvL9Fg4oH+ZWPs2ovCA3vNWGea6Sa5Z
-s1QBDWch1yBaHLStniC1vrLd4lUOraKXFqFBae75430vUlYxzXdaJXdbrzmvFp+V
-yLIZiT13SQKBgGcwPcwWyTMcpQu9ovLdSGLokoJoA9owABuFmsoKwhmIEknk3l9Y
-QbMe91PvoC5qsdYFkpeuzjYd33emjUmLjBLv8lulX2w0Q+MFeNWDZ6KXGauamfBd
-QIzH+z98D4E62EPiO6rLdFUXrBrngedScYcPqOtbUOGAa17eO7+eahE7AoGACKOR
-W5IHMGoteH2s8f+BVf7sWwMXMj6yoUMA57rrBwarsncGioZnLnymgPPavkroEGiO
-RFTv7xJaoKoQ5GehiH4dViOfDW66MoSAJ6JLc8aSXKxsXaeagTIqYezbe7xEaDPa
-gV0IhezK+EDrUvczP+3gGVBMnnv0KK0mK1NlbPECgYEAqs9Usr1XfV/2T0qYY+6J
-KiEHav/SL583ED9ZwPxE/DArc0T0GdJj6ZLhhZFPRFaIRoV4LvoTEg/P5yAg3gkk
-ngc7BCofbkMJ5fIDKO7d6p8aPnlJDYz6GVtGNFJqoCFw7138b0YoxRar0nlUXWBj
-LfwTdN+4AsR0S8oLaKju7QQ=
------END PRIVATE KEY-----