BUG修改 流水记录加入 查询商家或供应商字段 回调接口订单中加入通道名称

modules/admin/src/main/java/com/fire/admin/request/TransactionPram.java

@@ -32,4 +32,6 @@ public class TransactionPram {
     @ApiModelProperty(value ="每页显示条数")
     private Integer size;
 
+    @ApiModelProperty(value ="1、客户流水；2、供应商流水")
+    private Integer distinguish;
 }

modules/admin/src/main/java/com/fire/admin/service/impl/TransactionService.java

@@ -63,6 +63,11 @@ public class TransactionService {
         if (null != transactionPram.getServiceType()) {
             boolQuery.must(QueryBuilders.termQuery("serviceType", transactionPram.getServiceType()));
         }
+
+        //流水类型
+        if (null != transactionPram.getDistinguish()) {
+            boolQuery.must(QueryBuilders.termQuery("distinguish", transactionPram.getDistinguish()));
+        }
         //客户名称
         if (Strings.isNotBlank(transactionPram.getName())) {
             boolQuery.must(QueryBuilders.wildcardQuery("customerName.keyword", "*" + transactionPram.getName() + "*"));

modules/set-callback/src/main/java/com/fire/setcallback/service/impl/SetCallbackServiceImpl.java

@@ -122,6 +122,7 @@ public class SetCallbackServiceImpl implements SetCallbackService {
                 flowOrderInfo.setOperatorBalancePrice(mobileFlowDispatchRec.getOperatorBalancePrice());
                 flowOrderInfo.setAttr1(setCallbackParam.getOfficialStreamId());
                 flowOrderInfo.setChannelId(mobileFlowDispatchRec.getChannelId());
+                flowOrderInfo.setChannelName(mobileFlowDispatchRec.getChannelName());
                 flowOrderInfo.setNote(ORDER_SUCCESS.message());
             try {
                 //订单改redis状态