Merge remote-tracking branch 'upstream/master'

kmall-admin/src/main/java/com/kmall/admin/controller/compared/PayOrderInfoController.java

@@ -14,6 +14,7 @@ import com.kmall.admin.service.compared.PayOrderInfoService;
 import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.common.constant.Dict;
 import com.kmall.common.constant.JxlsXmlTemplateName;
+import com.kmall.common.utils.DateUtils;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
@@ -24,6 +25,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+
 
 /**
  * Controller
@@ -35,6 +38,8 @@ import org.springframework.web.multipart.MultipartFile;
 @Controller
 @RequestMapping("payorderinfo")
 public class PayOrderInfoController {
+    private static String  ISO = "iso-8859-1";
+    private static String  UTF = "utf-8";
     @Autowired
     private PayOrderInfoService payOrderInfoService;
     @Autowired
@@ -209,4 +214,18 @@ public class PayOrderInfoController {
         return R.ok();
     }
 
+    @RequestMapping("/comparedTime/{comparedDate}")
+    @ResponseBody
+    public R comparedTime(@PathVariable("comparedDate") String comparedDate) {
+        try {
+            Map<String, Object> params = new HashMap<>();
+            params.put("comparedDate",comparedDate);
+            String returnMsg = payOrderInfoService.comparedTime(params);
+            return R.ok().put("msg",returnMsg);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error(e.getMessage());
+        }
+
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/dao/MallPaymentOrderDataDao.java

@@ -3,6 +3,7 @@ package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.MallPaymentOrderDataEntity;
 import com.kmall.manager.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -22,4 +23,8 @@ public interface MallPaymentOrderDataDao extends BaseDao<MallPaymentOrderDataEnt
 
     List<MallPaymentOrderDataEntity> queryListTimeAndTnoData(Map<String, Object> params);
 
+    List<MallPaymentOrderDataEntity> queryListByOrderSn(@Param("list") List<String> orderSnList);
+
+    List<MallPaymentOrderDataEntity> queryListTime(Map<String, Object> params);
+
 }

kmall-admin/src/main/java/com/kmall/admin/dao/compared/PayOrderInfoDao.java

@@ -6,6 +6,7 @@ import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Dao
@@ -23,5 +24,9 @@ public interface PayOrderInfoDao extends BaseDao<PayOrderInfoEntity> {
      */
     List<PayOrderInfoEntity> queryNoComparedOrder(@Param("comparedDate") String comparedDate);
 
+    List<PayOrderInfoEntity> queryTimeAndPayType(Map map);
+
     void updateBatch(List<PayOrderInfoEntity> payOrderInfoEntities);
+
+    PayOrderInfoEntity queryByMerchOrderSn(String merchOrderSn);
 }

kmall-admin/src/main/java/com/kmall/admin/service/compared/PayOrderInfoService.java

@@ -91,4 +91,11 @@ public interface PayOrderInfoService {
      * @param payOrderInfoEntities
      */
     void updateBatch(List<PayOrderInfoEntity> payOrderInfoEntities);
+
+    /**
+     * 同步支付订单数据
+     * @param comparedDate
+     * @return
+     */
+    String comparedTime(Map<String, Object> params);
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/MallPaymentOrderDataServiceImpl.java

@@ -108,7 +108,7 @@ public class MallPaymentOrderDataServiceImpl implements MallPaymentOrderDataServ
                 //根据时间和商户订单号来判断当前数据是否有重复录入
                 List<MallPaymentOrderDataEntity> timeAndTnoData = mall2PaymentOrderDataDao.queryListTimeAndTnoData(map);
                 if (timeAndTnoData.size()>0) {
-                    throw new RRException("数据有重复,请检查导入数据的正确性!");
+                    throw new RRException("【"+outTradeNo+"】数据有重复,请检查导入数据的正确性!");
                 }
                 paymentOrderDataEntity.setCreaterSn(sysUserEntity.getUsername());
                 paymentOrderDataEntity.setCreateTime(new Date());
@@ -196,7 +196,7 @@ public class MallPaymentOrderDataServiceImpl implements MallPaymentOrderDataServ
                 //根据时间和商户订单号来判断当前数据是否有重复录入
                 List<MallPaymentOrderDataEntity> timeAndTnoData = mall2PaymentOrderDataDao.queryListTimeAndTnoData(map);
                 if (timeAndTnoData.size()>0) {
-                    throw new RRException("数据有重复,请检查导入数据的正确性!");
+                    throw new RRException("【"+outTradeNo+"】数据有重复,请检查导入数据的正确性!");
                 }
 
                 MallPaymentOrderDataEntity mallPaymentOrderDataEntity = new MallPaymentOrderDataEntity();
@@ -226,7 +226,7 @@ public class MallPaymentOrderDataServiceImpl implements MallPaymentOrderDataServ
                 //根据时间和商户订单号来判断当前数据是否有重复录入
                 List<MallPaymentOrderDataEntity> timeAndTnoData = mall2PaymentOrderDataDao.queryListTimeAndTnoData(map);
                 if (timeAndTnoData.size()>0) {
-                    throw new RRException("数据有重复,请检查导入数据的正确性!");
+                    throw new RRException("【"+outTradeNo+"】数据有重复,请检查导入数据的正确性!");
                 }
                 MallPaymentOrderDataEntity mallPaymentOrderDataEntity = new MallPaymentOrderDataEntity();
                 BeanUtils.copyProperties(aliPaymentOrderDto,mallPaymentOrderDataEntity);

kmall-admin/src/main/java/com/kmall/admin/service/impl/compared/PayOrderInfoServiceImpl.java

@@ -1,10 +1,12 @@
 package com.kmall.admin.service.impl.compared;
 
 import com.google.common.collect.ImmutableBiMap;
+import com.kmall.admin.dao.MallPaymentOrderDataDao;
 import com.kmall.admin.dao.compared.PayOrderInfoDao;
 import com.kmall.admin.dto.AliPaymentOrderDto;
 import com.kmall.admin.dto.PayOrderDto;
 import com.kmall.admin.dto.WxPaymentOrderDto;
+import com.kmall.admin.entity.MallPaymentOrderDataEntity;
 import com.kmall.admin.entity.compared.PayOrderInfoEntity;
 import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.admin.service.compared.PayOrderInfoService;
@@ -33,6 +35,8 @@ import java.util.Map;
 public class PayOrderInfoServiceImpl implements PayOrderInfoService {
     @Autowired
     private PayOrderInfoDao payOrderInfoDao;
+    @Autowired
+    private MallPaymentOrderDataDao mallPaymentOrderDataDao;
 
     @Override
     public PayOrderInfoEntity queryObject(Integer mpoiId) {
@@ -264,4 +268,106 @@ public class PayOrderInfoServiceImpl implements PayOrderInfoService {
     public void updateBatch(List<PayOrderInfoEntity> payOrderInfoEntities) {
         payOrderInfoDao.updateBatch(payOrderInfoEntities);
     }
+
+    @Override
+    public String comparedTime(Map<String, Object> params) {
+        String comparedDate = params.get("comparedDate").toString();
+        String msg = null;
+        if (!StringUtils.isNotEmpty(comparedDate)) {
+            throw new RRException("日期不能为空!");
+        }
+        List<MallPaymentOrderDataEntity> mallPaymentOrderDataEntityList = mallPaymentOrderDataDao.queryListTime(params);
+        List<PayOrderInfoEntity> payOrderInfoEntityList = payOrderInfoDao.queryTimeAndPayType(params);
+        if (mallPaymentOrderDataEntityList.size() == 0) {
+            msg = "支付订单详情暂无【" + comparedDate + "】数据";
+            return msg;
+        }
+//        if (payOrderInfoEntityList.size()>0) {
+//            msg = "支付单对比详情【" + comparedDate + "】数据已同步,请勿重复操作!";
+//            return msg;
+//        }
+        comparedTime(mallPaymentOrderDataEntityList,payOrderInfoEntityList);
+        msg = "日期【" + comparedDate + "】数据同步成功!";
+        return msg;
+    }
+
+    private void comparedTime(List<MallPaymentOrderDataEntity> mallPaymentOrderDataEntityList,List<PayOrderInfoEntity> payOrderInfoEntityList) {
+
+        List<PayOrderInfoEntity> insertList = new ArrayList<>();
+
+        if (mallPaymentOrderDataEntityList != null && mallPaymentOrderDataEntityList.size() > 0) {
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SysUserEntity userEntity = ShiroUtils.getUserEntity();
+            for (MallPaymentOrderDataEntity payOrderDto : mallPaymentOrderDataEntityList) {
+                String payFlag = payOrderDto.getPayFlag();
+                String timeStr = payOrderDto.getTimeStr();
+                String outTradeNo = payOrderDto.getOutTradeNo();
+                String payMoney = payOrderDto.getPayMoney();
+                //支付宝退款金额
+                String refundMoney = payOrderDto.getRefundMoney();
+                //微信退款金额
+                String applyRefundAmount = payOrderDto.getApplyRefundAmount();
+                if (Dict.payFlag.item_alipay.getItem().equals(payFlag)) {
+                    String style = payOrderDto.getPayType();
+                    if (style == null) {
+                        continue;
+                    }
+                    if (!style.equals("在线支付") && !style.equals("退款（交易退款）")) {
+                        continue;
+                    }
+                }
+                if (payOrderInfoEntityList != null && payOrderInfoEntityList.size() > 0) {
+                    PayOrderInfoEntity merchOrderSn = payOrderInfoDao.queryByMerchOrderSn(outTradeNo);
+                    if (merchOrderSn != null) {
+                        continue;
+                    }
+                }
+                PayOrderInfoEntity payOrderInfoEntity = new PayOrderInfoEntity();
+                payOrderInfoEntity.setImporter(userEntity.getUserId() + ""); // 导入者id
+                payOrderInfoEntity.setImportTime(format.format(new Date())); // 导入时间
+                if (Dict.payFlag.item_weixin.getItem().equals(payFlag)) {
+                    if (StringUtils.isNotEmpty(payMoney) && !"0.00".equals(payMoney)) {
+                        payOrderInfoEntity.setOrderStatus("300"); // 订单状态
+                        payOrderInfoEntity.setOrderAmount(new BigDecimal(payMoney)); // 订单金额
+                    } else {
+                        payOrderInfoEntity.setOrderStatus("401"); // 订单状态
+                        payOrderInfoEntity.setOrderAmount(new BigDecimal(0)); // 订单金额
+                    }
+                    if (StringUtils.isNotEmpty(applyRefundAmount) && !"0.00".equals(applyRefundAmount)) {
+                        payOrderInfoEntity.setPayStatus("5"); // 支付状态
+                        payOrderInfoEntity.setRefundAmount(new BigDecimal(applyRefundAmount)); // 退款金额
+                    } else {
+                        payOrderInfoEntity.setPayStatus("2"); // 支付状态
+                        payOrderInfoEntity.setRefundAmount(new BigDecimal(0)); // 退款金额
+                    }
+                } else if (Dict.payFlag.item_alipay.getItem().equals(payFlag)) {
+                    if (StringUtils.isNotEmpty(payMoney)) {
+                        payOrderInfoEntity.setOrderStatus("300"); // 订单状态
+                        payOrderInfoEntity.setOrderAmount(new BigDecimal(payMoney)); // 订单金额
+                    } else {
+                        payOrderInfoEntity.setOrderStatus("401"); // 订单状态
+                        payOrderInfoEntity.setOrderAmount(new BigDecimal(0)); // 订单金额
+                    }
+                    if (StringUtils.isNotEmpty(refundMoney)) {
+                        payOrderInfoEntity.setPayStatus("5"); // 支付状态
+                        payOrderInfoEntity.setRefundAmount(new BigDecimal(refundMoney)); // 退款金额
+                    } else {
+                        payOrderInfoEntity.setPayStatus("2"); // 支付状态
+                        payOrderInfoEntity.setRefundAmount(new BigDecimal(0)); // 退款金额
+                    }
+                }
+
+                payOrderInfoEntity.setPayFlag(payFlag); // 支付方式
+                payOrderInfoEntity.setPayTime(timeStr); // 交易时间
+
+                payOrderInfoEntity.setMerchOrderSn(outTradeNo); // 订单号
+                payOrderInfoEntity.setCompared("0"); // 是否对比过
+                insertList.add(payOrderInfoEntity);
+            }
+        }
+
+        if (insertList.size() > 0) {
+            payOrderInfoDao.saveBatch(insertList);
+        }
+    }
 }

kmall-admin/src/main/resources/mybatis/mapper/MallPaymentOrderDataDao.xml

@@ -142,6 +142,9 @@
 		<if test="endTime != null and endTime != ''">
 			AND time_str <![CDATA[ <  ]]> #{endTime}
 		</if>
+		<if test="outTradeNo != null and outTradeNo != ''">
+			AND out_trade_no = #{outTradeNo}
+		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -211,45 +214,18 @@
 
 	<select id="queryListTimeAndTnoData" resultType="com.kmall.admin.entity.MallPaymentOrderDataEntity">
 		select
-		`pay_order_id`,
 		`merchant_name`,
 		`out_trade_no`,
 		`pay_money`,
 		`refund_money`,
 		`pay_type`,
-		`payment_type`,
 		`transaction_order`,
 		`time_str`,
-		`attach`,
 		`transaction_status`,
 		`currency_type`,
 		`Amount_order`,
-		`refund_id`,
-		`mer_refund_number`,
-		`refund_type`,
-		`refund_status`,
 		`apply_refund_amount`,
-		`cash_coupon`,
-		`refund_rechargp_coupon`,
-		`fee_charge`,
-		`rate`,
-		`pay_flag`,
-		`serial_number`,
-		`opposite_account`,
-		`other_name`,
-		`bank_order`,
-		`business_basic_order`,
-		`business_billing_source`,
-		`business_order`,
-		`business_description`,
-		`remark`,
-		`rate_remark`,
-		`payment_notes`,
-		`creater_sn`,
-		`create_time`,
-		`moder_sn`,
-		`mod_time`,
-		`tstm`
+		`pay_flag`
 		from mall2_payment_order_data
 		WHERE 1=1
 		<if test="outTradeNo != null and outTradeNo != ''">
@@ -259,7 +235,42 @@
 			AND time_str = #{timeStr}
 		</if>
 	</select>
-	
+	<select id="queryListByOrderSn" resultType="com.kmall.admin.entity.MallPaymentOrderDataEntity">
+		select
+		`merchant_name`,
+		`out_trade_no`,
+		`transaction_order`,
+		`time_str`,
+		`pay_flag`
+		from mall2_payment_order_data
+		WHERE 1=1
+		<if test="outTradeNo != null and outTradeNo != ''">
+			AND out_trade_no in
+			<foreach collection="list" item="outTradeNo" open="(" separator="," close=")">
+				#{outTradeNo}
+			</foreach>
+		</if>
+	</select>
+	<select id="queryListTime" resultType="com.kmall.admin.entity.MallPaymentOrderDataEntity">
+		select
+		`merchant_name`,
+		`out_trade_no`,
+		`pay_money`,
+		`refund_money`,
+		`pay_type`,
+		`transaction_order`,
+		`time_str`,
+		`refund_type`,
+		`apply_refund_amount`,
+		`pay_flag`
+		from mall2_payment_order_data
+		WHERE 1=1 and
+			DATE_FORMAT(time_str,'%Y-%m-%d')= #{comparedDate}
+		<if test="payFlag != null and payFlag.trim() != ''">
+			AND pay_flag = #{payFlag}
+		</if>
+		order by time_str
+	</select>
  	<select id="queryTotal" resultType="int">
 		select count(*) from mall2_payment_order_data
 		WHERE 1=1
@@ -275,6 +286,9 @@
 		<if test="endTime != null and endTime != ''">
 			AND time_str <![CDATA[ <  ]]> #{endTime}
 		</if>
+		<if test="outTradeNo != null and outTradeNo != ''">
+			AND out_trade_no = #{outTradeNo}
+		</if>
 	</select>
 	 
 	<insert id="save" parameterType="com.kmall.admin.entity.MallPaymentOrderDataEntity" useGeneratedKeys="true" keyProperty="payOrderId">

kmall-admin/src/main/resources/mybatis/mapper/compared/PayOrderInfoDao.xml

@@ -36,6 +36,24 @@
 		where mpoi_id = #{id}
 	</select>
 
+	<select id="queryByMerchOrderSn" resultType="com.kmall.admin.entity.compared.PayOrderInfoEntity">
+		select
+			`mpoi_id`,
+			`merch_order_sn`,
+			`pay_status`,
+			`order_amount`,
+			`refund_amount`,
+			`order_status`,
+			`pay_flag`,
+			`pay_time`,
+			`import_time`,
+			`importer`,
+			`compared`,
+			`compared_time`
+		from mall_pay_order_info
+		where merch_order_sn = #{merchOrderSn} limit 1
+	</select>
+
 	<select id="queryList" resultType="com.kmall.admin.entity.compared.PayOrderInfoEntity">
 		select
     		`mpoi_id`,
@@ -186,6 +204,27 @@
 		order by pay_time
 	</select>
 
+	<select id="queryTimeAndPayType" resultType="com.kmall.admin.entity.compared.PayOrderInfoEntity">
+		select
+		`mpoi_id`,
+		`merch_order_sn`,
+		`pay_status`,
+		`order_amount`,
+		`refund_amount`,
+		`order_status`,
+		`pay_flag`,
+		`pay_time`,
+		`import_time`,
+		`importer`,
+		`compared`,
+		`compared_time`
+		from mall_pay_order_info
+		WHERE 1=1
+		AND compared = 0
+		and date_format(pay_time, '%Y-%m-%d') = #{comparedDate}
+		order by pay_time
+	</select>
+
 	<update id="updateBatch" parameterType="java.util.List">
 		<foreach collection="list" item="oderInfo" index="index" open="" close="" separator=";">
 			update mall_pay_order_info

kmall-admin/src/main/webapp/WEB-INF/page/compared/payorderinfo.html

@@ -16,13 +16,19 @@
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
-                <i-col span="5">
+               <!-- <i-col span="5">
+                    <i-select v-model="q.payFlag" filterable placeholder="支付类型">
+                        <i-option v-for="mct in machineCodeTypes" :value="mct.value" :key="mct.value">{{mct.name}}</i-option>
+                    </i-select>
+                </i-col>-->
+                <i-col span="10">
                     <Date-picker v-model="comparedDate" placeholder="对比日期"/>
                 </i-col>
-                <i-button type="info" @click="compared"><i class="fa fa-plus"></i>&nbsp;对比</i-button>
-<!--                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>-->
+                <i-button type="info" @click="comparedTime" title="需要选择时间,同步支付订单信息!"><i class="fa fa-pencil-square-o"></i>&nbsp;同步</i-button>
+                <i-button type="info" @click="compared" title="需要选择时间,对比支付单信息!"><i class="fa fa-plus"></i>&nbsp;对比</i-button>
+                <!--                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>-->
 <!--                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>-->
-                <i-col style="display: inline-grid;">
+                <!--<i-col style="display: inline-grid;">
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
                             :format="['xls','xlsx']"
                             action="../payorderinfo/uploadAlipayOrder">
@@ -35,11 +41,11 @@
                             action="../payorderinfo/uploadWXOrder">
                         <i-button type="ghost" icon="ios-cloud-upload-outline">微信支付订单导入</i-button>
                     </Upload>
-                </i-col>
+                </i-col>-->
                <!-- <a href="../statics/file/alipay_pay_order.xls">支付宝模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
                 <a href="../statics/file/weixin_pay_order.xls">微信模板下载</a>-->
-                <a href="../statics/file/ali_yyyy_mm_dd_v1.0.0.xls">支付宝模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
-                <a href="../statics/file/wx_yyyy_mm_dd_v1.0.0.xls">微信模板下载</a>
+                <!--<a href="../statics/file/ali_yyyy_mm_dd_v1.0.0.xls">支付宝模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                <a href="../statics/file/wx_yyyy_mm_dd_v1.0.0.xls">微信模板下载</a>-->
             </div>
         </Row>
 	    <table id="jqGrid"></table>

kmall-admin/src/main/webapp/WEB-INF/page/shop/mallpaymentorderdata.html

@@ -20,6 +20,9 @@
                     <i-col span="3">
                         <Date-picker v-model="q.endTime" placeholder="创建订单结束时间"/>
                     </i-col>
+                    <i-col span="3">
+                        <i-input v-model="q.outTradeNo" @on-enter="query" placeholder="商户订单编号"/>
+                    </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
             </div>

kmall-admin/src/main/webapp/js/compared/payorderinfo.js

@@ -80,13 +80,15 @@ let vm = new Vue({
         showList: true,
         title: null,
 		payOrderInfo: {},
+		machineCodeTypes:[],
 		ruleValidate: {
 			name: [
 				{required: true, message: '名称不能为空', trigger: 'blur'}
 			]
 		},
 		q: {
-		    merchOrderSn: ''
+		    merchOrderSn: '',
+			payFlag:'',
 
 		},
 		comparedDate:""
@@ -105,6 +107,18 @@ let vm = new Vue({
 				//vm.mall2OrderingEarlyWarningReminds = r.mall2OrderingEarlyWarningReminds;
 			});
 		},
+		comparedTime: function () {
+			if(vm.comparedDate == ""){
+				alert("请输入对比日期!");
+				return;
+			}
+			var comparedDate = transDate(vm.comparedDate,'yyyy-MM-dd');
+			$.get("../payorderinfo/comparedTime/"+comparedDate, function (r) {
+				alert(r.msg, function (index) {
+					$("#jqGrid").trigger("reloadGrid");
+				});
+			});
+		},
 		add: function () {
 			vm.showList = false;
 			vm.title = "新增";
@@ -188,7 +202,8 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-				merchOrderSn: ''
+				merchOrderSn: '',
+				payFlag:'',
             }
             vm.reload(1);
 		},
@@ -200,7 +215,8 @@ let vm = new Vue({
 				page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			}
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'merchOrderSn': vm.q.merchOrderSn},
+                postData: {'merchOrderSn': vm.q.merchOrderSn,
+					'payFlag': vm.q.payFlag},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');
@@ -213,5 +229,10 @@ let vm = new Vue({
         handleReset: function (name) {
             handleResetForm(this, name);
         }
-	}
+	},
+	mounted() {
+		$.get("../sys/macro/queryMacrosByValue?value=payFlag", function (r) {
+			vm.machineCodeTypes = r.list;
+		});
+	},
 });

kmall-admin/src/main/webapp/js/shop/mallpaymentorderdata.js

@@ -10,7 +10,15 @@ $(function () {
 			{label: '微信订单/支付宝交易号', name: 'transactionOrder', index: 'transaction_order', width: 80},
 			{label: '订单/收入金额', name: 'payMoney', index: 'pay_money', width: 80},
 			{label: '退款/支出金额', name: 'refundMoney', index: 'refund_money', width: 80},
-			{label: '支付方式', name: 'payFlag', index: 'pay_flag', width: 80},
+			{label: '支付方式', name: 'payFlag', index: 'pay_flag', width: 80,formatter:function(value){
+					if(value == "weixin"){
+						return "微信支付";
+					}else if(value == "alipay"){
+						return "支付宝支付";
+					}else{
+						return value;
+					}
+				}},
 			{label: '交易/入账时间', name: 'timeStr', index: 'time_str', width: 80},
 			{label: '添加人', name: 'createrSn', index: 'creater_sn', width: 80},
 			{label: '上传时间', name: 'createTime', index: 'create_time', width: 80, formatter: function (value) {
@@ -74,6 +82,7 @@ let vm = new Vue({
 			payFlag: '',
 			startTime:'',
 			endTime:'',
+			outTradeNo:'',
 		},
 		flag : true,
 	},
@@ -161,6 +170,7 @@ let vm = new Vue({
 				payFlag: '',
 				startTime:'',
 				endTime:'',
+				outTradeNo:'',
             }
             vm.reload();
 		},
@@ -172,7 +182,8 @@ let vm = new Vue({
                 postData: {'name': vm.q.name,
 					'payFlag': vm.q.payFlag,
 					'startTime': vm.q.startTime,
-					'endTime': vm.q.endTime,},
+					'endTime': vm.q.endTime,
+				'outTradeNo':vm.q.outTradeNo},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');