新需求

src/main/java/com/huiju/estateagents/redpack/mapper/TaOrgOrderMapper.java

@@ -64,7 +64,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                          @Param("miniAppName") String miniAppName);
 
     /**
-     * 充值退款订单导出
+     * 充值订单导出
      *
      * @return
      */

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgAccountServiceImpl.java

@@ -117,6 +117,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         int taOrgAccountDetailedListInsertResult = taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
 
         //插入凭证记录
+        taOrgAccount.setAccountId(accountId);
         if (CollectionUtils.isNotEmpty(taOrgAccount.getCertificateList())) {
             List<TaOrgAccountCertificate> taOrgAccountCertificateList = assembleAccountCertificate(orgId, taOrgAccount, taOrgAccountDetailedList.getSerialNo(), taOrgOrder.getOrderId(), userId, CommConstant.ITEM_TYPE_RECHARGE);
             taOrgAccountCertificateList.forEach(e -> {
@@ -169,6 +170,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         int taOrgAccountDetailedListInsertResult = taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
 
         //插入凭证记录
+        taOrgAccount.setAccountId(accountId);
         if (CollectionUtils.isNotEmpty(taOrgAccount.getCertificateList())) {
             List<TaOrgAccountCertificate> taOrgAccountCertificateList = assembleAccountCertificate(orgId, taOrgAccount, taOrgAccountDetailedList.getSerialNo(), taOrgOrder.getOrderId(), userId, CommConstant.ITEM_TYPE_REFUND);
             taOrgAccountCertificateList.forEach(e -> {

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

@@ -1,5 +1,26 @@
 package com.huiju.estateagents.redpack.service.impl;
 
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -22,29 +43,26 @@ import com.huiju.estateagents.excel.redPacket.AccountConsumeRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountPayRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountRefundRecordExport;
 import com.huiju.estateagents.mapper.TaWxPayConfigMapper;
-import com.huiju.estateagents.redpack.entity.*;
-import com.huiju.estateagents.redpack.mapper.*;
+import com.huiju.estateagents.redpack.entity.ConsumeOrder;
+import com.huiju.estateagents.redpack.entity.RechargeOrder;
+import com.huiju.estateagents.redpack.entity.RefundOrder;
+import com.huiju.estateagents.redpack.entity.TaOrgAccount;
+import com.huiju.estateagents.redpack.entity.TaOrgAccountBlocked;
+import com.huiju.estateagents.redpack.entity.TaOrgAccountCertificate;
+import com.huiju.estateagents.redpack.entity.TaOrgAccountDetailedList;
+import com.huiju.estateagents.redpack.entity.TaOrgOrder;
+import com.huiju.estateagents.redpack.entity.TaOrgOrderDetail;
+import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountBlockedMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountCertificateMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountDetailedListMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderDetailMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgRefundApplicationMapper;
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * <p>
@@ -454,10 +472,6 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         TaOrgOrder taOrgOrder = assembleTaOrgOrder(id);
         taOrgOrderMapper.updateById(taOrgOrder);
 
-//        //更新关联订单明细
-//        TaOrgOrderDetail taOrgOrderDetail = assembleTaOrgOrderDetail(taOrgOrder.getOrderId(), refundApplication.getOrgId(), taOrgAccount.getRechargeAmount());
-//        int taOrgOrderDetailInsertResult = taOrgOrderDetailMapper.insert(taOrgOrderDetail);
-
         //新建账户消费流水
         TaOrgAccountDetailedList taOrgAccountDetailedList = assembleAccountDetailList(id, refundApplication, userId);
         taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
@@ -479,14 +493,6 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             });
         }
 
-//        if (taOrgOrderInsertResult < 1 ||
-//                taOrgAccountDetailedListInsertResult < 1 ||
-//                taOrgRefundApplicationUpdateResult < 1 ||
-//                taOrgAccountBlockedUpdateResult < 1) {
-//            responseBean.addError("订单退款失败");
-//            return responseBean;
-//        }
-
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

@@ -7,8 +7,12 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.redpack.entity.TaH5Template;
+import com.huiju.estateagents.redpack.service.ITaH5TemplateService;
 import com.huiju.estateagents.sample.entity.*;
 import com.huiju.estateagents.sample.service.*;
+
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +53,9 @@ public class TaH5SampleController extends BaseController {
     @Autowired
     public ITaNoticeService taNoticeService;
 
+    @Autowired
+    public ITaH5TemplateService taH5TemplateService;
+
     /**
      * 分页查询列表
      *
@@ -316,6 +323,11 @@ public class TaH5SampleController extends BaseController {
             if (!StringUtils.isEmpty(taH5Sample.getTag())) {
                 taH5Sample.setTags(Arrays.asList(taH5Sample.getTag().split(",")));
             }
+
+            QueryWrapper<TaH5Template> taH5TemplateQueryWrapper = new QueryWrapper<>();
+            taH5TemplateQueryWrapper.eq("h5_template_id", taH5Sample.getH5TemplateId());
+            List<TaH5Template> taH5Templates = taH5TemplateService.list(taH5TemplateQueryWrapper);
+            taH5Sample.setTaH5Template(taH5Templates);
             responseBean.addSuccess(taH5Sample);
         } catch (Exception e) {
             e.printStackTrace();
@@ -348,6 +360,9 @@ public class TaH5SampleController extends BaseController {
             iTaSampleContactService.remove(taSampleContactQueryWrapper);
             taH5Sample.setUpdateUser(getSysUserId(request));
             taH5Sample.setUpdateDate(LocalDateTime.now());
+            if (CollectionUtils.isNotEmpty(taH5Sample.getTaH5Template())){
+                taH5Sample.setH5TemplateId(taH5Sample.getTaH5Template().get(0).getH5TemplateId());
+            }
             if (iTaH5SampleService.updateById(taH5Sample)) {
                 List<TaContact> taContactList = taH5Sample.getTaContactList();
                 taContactList.forEach(e -> {

src/main/java/com/huiju/estateagents/sample/entity/TaH5Sample.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.huiju.estateagents.redpack.entity.TaH5Template;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -141,4 +142,7 @@ public class TaH5Sample implements Serializable {
      *  模板ID
      */
     private String h5TemplateId;
+
+    @TableField(exist = false)
+    private List<TaH5Template> taH5Template;
 }

src/main/resources/mapper/redpack/TaOrgOrderMapper.xml

@@ -12,6 +12,7 @@
         b.name as miniAppName,
         t.is_offline,
         t.create_date,
+        group_concat(c.url) as certificateUrl,
         <if test="orderType == 'refund'">
             d.audit_status,
             d.audit_result,
@@ -111,7 +112,6 @@
         From ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id
         left join ta_miniapp b on t.org_id = b.org_id
-        left join ta_org_account_certificate c on t.order_id = c.order_id
         where
         a.item_type = #{itemType}
         <if test="tradeNo != null and tradeNo != ''">