应用购买优化

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

@@ -193,7 +193,8 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
             tabHaobanAppOrderService.insert(appOrder);
             return ServiceResponse.success(true);
         }
-        return ServiceResponse.failure(response.getCode(), response.getMessage());
+        String errMessage = "订单创建失败，复制链接查看失败原因：https://developer.work.weixin.qq.com/devtool/query?e="+response.getCode();
+        return ServiceResponse.failure(response.getCode(), errMessage);
     }
 
     @Override
@@ -245,7 +246,7 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
         AppOrderCheckDTO result = new AppOrderCheckDTO();
         Date now = new Date();
         Date endTime = DateUtil.addDay(now, -1);
-        Date appOrderEndTime = DateUtil.addDay(now, -1);
+        Date appOrderEndTime = new Date(0);
         result.setNow(now);
         List<TabHaobanWxEnterpriseRelated> enterpriseIdList = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId);
         if (CollUtil.isNotEmpty(enterpriseIdList)) {
@@ -269,9 +270,11 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
         if (CollUtil.isNotEmpty(list)) {
             Date beginTime = new Date();
             Integer num = 0;
+            Boolean flag = false;
             for (AppOrderPageDTO dto : list) {
                 if (dto.getOrderStatus() == 2 ){
                     num += dto.getUserNum();
+                    flag = true;
                     if (appOrderEndTime.before(dto.getEndTime())){
                         appOrderEndTime = dto.getEndTime();
                         beginTime = dto.getBeginTime();
@@ -288,6 +291,9 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
                 result.setEndTime(appOrderEndTime);
                 result.setBeginTime(beginTime);
             }else {
+                if (flag){
+                    result.setEndTime(appOrderEndTime);
+                }
                 result.setType(1);
             }
         } else {

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

@@ -263,7 +263,7 @@
         <if test="orderStatus != null">
             and order_status = #{orderStatus}
         </if>
-        order by create_time
+        order by create_time desc
     </select>
 
     <select id="queryByOrderId" resultMap="TabHaobanAppOrderMap">