bug fix

src/main/java/com/huiju/estateagents/common/StringUtils.java

@@ -69,4 +69,8 @@ public class StringUtils {
         }
         return returnStr;
     }
+
+    public static String strReplace(String objectStr){
+        return objectStr.replaceAll( "finance,|,finance|finance","");
+    }
 }

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

@@ -693,7 +693,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         TaOrgRefundApplication taOrgRefundApplication = new TaOrgRefundApplication();
         taOrgRefundApplication.setAuditorId(userId);
         taOrgRefundApplication.setAuditorName(taUser.getUserName());
-        taOrgRefundApplication.setAuditResult(CommConstant.ITEM_TYPE_REFUND.equals(operateType) ? "退款成功" : refundApplication.getAuditResult());
+        taOrgRefundApplication.setAuditResult(CommConstant.ITEM_TYPE_REFUND.equals(operateType) ? "" : refundApplication.getAuditResult());
         taOrgRefundApplication.setAuditStatus(CommConstant.ITEM_TYPE_REFUND.equals(operateType) ? "agree" : "unAgree");
 
         return taOrgRefundApplication;

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

@@ -300,7 +300,7 @@ public class TaContactController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             taContacts.forEach(e -> {
-                e.setContactType(null);
+                e.setContactType(StringUtils.strReplace(e.getContactType()));
             });
             if (iTaContactService.updateBatchById(taContacts)) {
                 responseBean.addSuccess(taContacts);

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

@@ -67,7 +67,8 @@
         c.phone,
         t.trading_status,
         d.`name` as activityName,
-        t.pay_date
+        t.pay_date,
+        a.target_type as consumeType
         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