自测接口开发

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/licence/TabHaobanLicenceOrderMapper.java

@@ -67,6 +67,6 @@ public interface TabHaobanLicenceOrderMapper {
      * @return
      */
 
-    List<LicenceOrderPageDTO> getLicenceOrderPage(LicenceOrderPageQDTO licenceOrderPageQDTO);
+    List<TabHaobanLicenceOrder> getLicenceOrderPage(LicenceOrderPageQDTO licenceOrderPageQDTO);
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/licence/LicenceOrderService.java

 package com.gic.haoban.manage.service.service.licence;
 
 import com.gic.api.base.commons.Page;
-import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.licence.LicenceOrderPageDTO;
 import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderPageQDTO;
 import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderQDTO;
 import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder;
 
-import java.util.List;
-
 /**
  * <p>
  * 企业微信许可账号购买

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/licence/impl/LicenceOrderServiceImpl.java

@@ -147,15 +147,15 @@ public class LicenceOrderServiceImpl implements LicenceOrderService {
         String wxEnterpriseName="";
         EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(enterpriseId);
         if (ObjectUtil.isNotNull(enterpriseDTO)){
-            enterpriseDTO.getEnterpriseName();
+            enterpriseName=enterpriseDTO.getEnterpriseName();
         }
         WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
         if (ObjectUtil.isNotNull(wxEnterpriseDTO)){
-            wxEnterpriseDTO.getCorpName();
+            wxEnterpriseName=wxEnterpriseDTO.getCorpName();
         }
         String dateToStr = DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19);
         //发送钉钉消息通知
-        String msg = "标题：企微账号许可通知 品牌名称:"+enterpriseName+" 企业名称："+wxEnterpriseName+" 消息内容："+dateToStr+"新增订单"+orderId+",请尽快处理";
+        String msg = "标题：企微账号许可通知\n品牌名称:"+enterpriseName+"\n"+"企业名称："+wxEnterpriseName+"\n"+"消息内容："+dateToStr+"订单编号为"+tabHaobanLicenceOrder.getTransactionId()+",请尽快处理";
         DingUtils.send(msg,"https://oapi.dingtalk.com/robot/send?access_token=63074c9fc1ac2c00aa62477facdf16e5fa2388cf6a621edba1fb05d6e55d031f",false);
         return true;
     }
@@ -179,10 +179,10 @@ public class LicenceOrderServiceImpl implements LicenceOrderService {
             qdto.setEndTime(qdto.getEndTime() + " 23:59:59");
         }
         PageHelper.startPage(qdto);
-        List<LicenceOrderPageDTO> licenceOrderPage = tabHaobanLicenceOrderMapper.getLicenceOrderPage(qdto);
+        List<TabHaobanLicenceOrder> licenceOrderPage = tabHaobanLicenceOrderMapper.getLicenceOrderPage(qdto);
         //判断订单状态，支付时间已过的订单的需要更改订单状态为已过期
-        for (LicenceOrderPageDTO dto : licenceOrderPage){
-            if (dto.getExpireTime().before(new Date())){
+        for (TabHaobanLicenceOrder dto : licenceOrderPage){
+            if (dto.getExpireTime().before(new Date()) && dto.getOrderStatus() == 0){
                 dto.setOrderStatus(3);
                 updateLicenceOrderType(dto.getOrderId(), 3,qdto.getEnterpriseId(), qdto.getWxEnterpriseId(), qdto.getCreatorName());
             }

haoban-manage3-service/src/main/resources/mapper/licence/TabHaobanLicenceOrderMapper.xml

@@ -32,8 +32,7 @@
         <result column="expire_time" property="expireTime"/>
     </resultMap>
     <sql id="Base_Column_List">
-        order_id
-        ,
+        order_id,
 	  enterprise_id,
 	  wx_enterprise_id,
 	  order_type,
@@ -175,14 +174,14 @@
 
 
     <update id="updateLicenceOrderType">
-        UPDATE tab_haoban_licence_order_progress
-        SET order_type = #{type}
+        UPDATE tab_haoban_licence_order
+        SET order_status = #{type}
         WHERE order_id = #{orderId}
           and delete_flag = 0
     </update>
 
     <update id="uploadLicenceOrderVoucher">
-        UPDATE tab_haoban_licence_order_progress
+        UPDATE tab_haoban_licence_order
         SET voucher = #{voucher}
         WHERE order_id = #{orderId}
           and delete_flag = 0
@@ -196,7 +195,7 @@
           and order_status = 0 limit 1
     </select>
 
-    <select id="getLicenceOrderPage"  resultType="com.gic.haoban.manage.api.dto.licence.LicenceOrderPageDTO">
+    <select id="getLicenceOrderPage"  resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List"/>
         FROM tab_haoban_licence_order
         WHERE  delete_flag = 0

haoban-manage3-service/src/main/resources/mapper/licence/TabHaobanLicenceOrderProgressMapper.xml

@@ -16,8 +16,8 @@
         <result column="creator_name" property="creatorName"/>
     </resultMap>
     <sql id="Base_Column_List">
-        enterprise_id
-        ,
+      id,
+      enterprise_id,
 	  wx_enterprise_id,
 	  order_id,
 	  order_status,

haoban-manage3-service/src/test/java/DealSyncTest.java

@@ -7,7 +7,6 @@ import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.service.service.StaffService;
-import com.gic.haoban.manage.service.service.TestService;
 import com.gic.wechat.api.dto.qywx.DepartmentDTO;
 import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
@@ -43,8 +42,6 @@ public class DealSyncTest {
     @Autowired
     private QywxDepartmentApiService qywxDepartmentApiService;
 
-    @Autowired
-    private TestService testService;
 
     @Autowired
     private StaffClerkRelationApiService staffClerkRelationApiService;

haoban-manage3-service/src/test/java/LicenceOrderServiceTest.java

+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.haoban.manage.api.dto.licence.LicenceOrderDTO;
+import com.gic.haoban.manage.api.dto.licence.LicenceOrderPageDTO;
+import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderPageQDTO;
+import com.gic.haoban.manage.api.service.licence.LicenceOrderApiService;
+import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder;
+import com.gic.haoban.manage.service.service.licence.LicenceOrderService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @description:
+ * @Author: wenhua
+ * @Date: 2023/3/22 11:37
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:applicationContext-conf.xml" })
+public class LicenceOrderServiceTest {
+
+    @Autowired
+    private LicenceOrderService licenceOrderService;
+    @Autowired
+    private LicenceOrderApiService licenceOrderApiService;
+
+    @Test
+    public void test1(){
+        Boolean qweqwe = licenceOrderService.uploadLicenceOrderVoucher(1L, "qweqwe","111","111","jx");
+    }
+    @Test
+    public void test2(){
+        LicenceOrderPageQDTO qdto = new LicenceOrderPageQDTO();
+        Page<LicenceOrderPageDTO> licenceOrderPage = licenceOrderService.getLicenceOrderPage(qdto);
+
+    }
+    @Test
+    public void test3(){
+        ServiceResponse<LicenceOrderDTO> licenceOrderDetail = licenceOrderApiService.getLicenceOrderDetail(1L, null);
+
+    }
+}