应用订单购买接口

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

@@ -58,5 +58,14 @@ public interface AppOrderApiService {
      */
     ServiceResponse<Boolean> qywxCallBack(String param);
 
+    /**
+     * 定时获取好办付费应用订单列表
+     * @param param {"start_time" : 1542091572,"end_time" : 1542177972,"test_mode" : 1}
+     * @return
+     */
+    ServiceResponse<Boolean> getAppOrderList(String param);
+
+
+
 
 }

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

@@ -82,5 +82,11 @@ public interface TabHaobanAppOrderMapper {
 
     List<TabHaobanAppOrder> getAppOrderPage(AppOrderPageQDTO qdto);
 
+    /**
+     * @param orderId 企业微信订单id
+     * @return 实例对象
+     */
+    TabHaobanAppOrder queryByOrderId(@Param("orderId")String orderId);
+
 }
 

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

@@ -5,6 +5,8 @@ import com.gic.haoban.manage.api.dto.licence.AppOrderPageDTO;
 import com.gic.haoban.manage.api.dto.qdto.licence.AppOrderPageQDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanAppOrder;
 
+import java.util.List;
+
 /**
  * (TabHaobanAppOrder)表服务接口
  *
@@ -30,6 +32,12 @@ public interface TabHaobanAppOrderService {
     TabHaobanAppOrder insert(TabHaobanAppOrder tabHaobanAppOrder);
 
     /**
+     * 批量新增数据
+     * @param entities
+     */
+    void insertBatch(List<TabHaobanAppOrder> entities);
+
+    /**
      * 修改数据
      *
      * @param tabHaobanAppOrder 实例对象
@@ -47,4 +55,11 @@ public interface TabHaobanAppOrderService {
 
     Page<AppOrderPageDTO> getAppOrderPage(AppOrderPageQDTO qdto);
 
+    /**
+     * 根据企业微信订单id查询
+     * @param orderId
+     * @return
+     */
+    TabHaobanAppOrder queryByOrderId(String orderId);
+
 }

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

@@ -51,6 +51,11 @@ public class TabHaobanAppOrderServiceImpl implements TabHaobanAppOrderService {
         return tabHaobanAppOrder;
     }
 
+    @Override
+    public void insertBatch(List<TabHaobanAppOrder> entities) {
+        this.tabHaobanAppOrderMapper.insertBatch(entities);
+    }
+
     /**
      * 修改数据
      *
@@ -83,4 +88,9 @@ public class TabHaobanAppOrderServiceImpl implements TabHaobanAppOrderService {
         List<TabHaobanAppOrder> page = tabHaobanAppOrderMapper.getAppOrderPage(qdto);
         return PageHelperUtils.changePageHelperToCurrentPage(page, AppOrderPageDTO.class);
     }
+
+    @Override
+    public TabHaobanAppOrder queryByOrderId(String orderId) {
+        return tabHaobanAppOrderMapper.queryByOrderId(orderId);
+    }
 }

haoban-manage3-service/src/main/resources/mapper/TabHaobanAppOrderMapper.xml

@@ -265,5 +265,13 @@
         </if>
     </select>
 
+    <select id="queryByOrderId" resultMap="TabHaobanAppOrderMap">
+        select
+            id, wx_enterprise_id, order_id, order_status, order_type, user_num, duration, begin_time, end_time, pay_time, origin_price, paid_price, order_url, delete_flag, create_time, update_time, creator_id, creator_name,expire_time
+        from tab_haoban_app_order
+        where order_id = #{orderId} and delete_flag = 0
+        limit 1
+    </select>
+
 </mapper>
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/licence/AppOrderController.java

@@ -9,6 +9,8 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
+import com.gic.haoban.manage.api.dto.licence.AppOrderCheckDTO;
+import com.gic.haoban.manage.api.dto.licence.AppOrderNoticeDTO;
 import com.gic.haoban.manage.api.dto.licence.AppOrderPageDTO;
 import com.gic.haoban.manage.api.dto.qdto.licence.AppOrderPageQDTO;
 import com.gic.haoban.manage.api.dto.qdto.licence.AppOrderQDTO;
@@ -39,11 +41,6 @@ import org.springframework.web.bind.annotation.RestController;
 public class AppOrderController {
 
     private static Logger logger = LogManager.getLogger(AppOrderController.class);
-
-    @Autowired
-    private EnterpriseService enterpriseService;
-    @Autowired
-    private WxEnterpriseApiService wxEnterpriseApiService;
     @Autowired
     private AppOrderApiService appOrderApiService;
 
@@ -113,8 +110,9 @@ public class AppOrderController {
         if (loginUser == null || StringUtils.isBlank(loginUser.getEnterpriseId())) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
         }
-
-        return RestResponse.successResult(null);
+        ServiceResponse<AppOrderCheckDTO> response = appOrderApiService.checkAppOrder(loginUser.getWxEnterpriseId());
+        AppOrderCheckVO vo = JSONObject.parseObject(JSONObject.toJSONString(response.getResult()), AppOrderCheckVO.class);
+        return RestResponse.successResult(vo);
     }
 
     /**
@@ -126,7 +124,9 @@ public class AppOrderController {
         if (loginUser == null || StringUtils.isBlank(loginUser.getEnterpriseId())) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
         }
-        return RestResponse.successResult(null);
+        ServiceResponse<AppOrderNoticeDTO> response = appOrderApiService.noticeAppOrder(loginUser.getWxEnterpriseId());
+        AppOrderNoticeVO vo = JSONObject.parseObject(JSONObject.toJSONString(response.getResult()), AppOrderNoticeVO.class);
+        return RestResponse.successResult(vo);
     }
 
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/licence/LicenceOrderController.java

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.controller.licence;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -15,6 +16,7 @@ import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.licence.AppOrderNoticeDTO;
 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.licence.RenewalUserDTO;
@@ -22,6 +24,7 @@ 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.api.dto.qdto.licence.RenewalUserQDTO;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.api.service.licence.AppOrderApiService;
 import com.gic.haoban.manage.api.service.licence.LicenceOrderApiService;
 import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
@@ -74,6 +77,8 @@ public class LicenceOrderController {
     private Pay4WXService pay4WXService;
     @Autowired
     private Config config;
+    @Autowired
+    private AppOrderApiService appOrderApiService;
 
     /**
      * 查询订单详情
@@ -351,8 +356,15 @@ public class LicenceOrderController {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
         }
         ServiceResponse<String> payLicenceOrder = licenceOrderApiService.isPayLicenceOrder(loginUser.getWxEnterpriseId());
-        //todo 判断续期订单
-        return RestResponse.successResult(null);
+        AppOrderNoticeDTO result = appOrderApiService.noticeAppOrder(loginUser.getWxEnterpriseId()).getResult();
+        if (null != result && (0 == result.getType() || 4 == result.getType())){
+            if (StrUtil.isNotBlank(payLicenceOrder.getResult())){
+                result.setType(3);
+                result.setOrderId(payLicenceOrder.getResult());
+            }
+        }
+        AppOrderNoticeVO vo = JSONObject.parseObject(JSONObject.toJSONString(result), AppOrderNoticeVO.class);
+        return RestResponse.successResult(vo);
     }
 
     /**

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/licence/AppOrderCheckVO.java

@@ -42,6 +42,5 @@ public class AppOrderCheckVO implements Serializable {
     /**
      * 当前时间
      */
-    private Date now;
 
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/licence/AppOrderNoticeVO.java

@@ -20,7 +20,7 @@ public class AppOrderNoticeVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
     /**
-     * 弹窗类型  0 无需弹窗 1 未购买付费应用弹窗  2付费应用已过期弹窗 3 查询购买许可账号是否存在未支付订单
+     * 弹窗类型  0 无需弹窗 1 未购买付费应用弹窗  2付费应用已过期弹窗 3 查询购买许可账号是否存在未支付订单 4登录好办，即将过期弹窗
      */
     private Integer type;
     /**