Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketHelpController.java

      * @return
      */
     @RequestMapping(value = "/admin/redPacket/help/{id}", method = RequestMethod.PUT)
-    public ResponseBean taRedPacketHelpUpdate(@PathVariable Integer id,
-                                              @RequestBody TaRedPacketHelp taRedPacketHelp) {
+    public ResponseBean taRedPacketHelpUpdate(@RequestBody TaRedPacketHelp taRedPacketHelp) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaRedPacketHelpService.updateRedPackHelp(taRedPacketHelp);

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

             taRedPacketHelp.setEndDate(taRedPacket.getEndDate());
             taRedPacketHelp.setActivityEndTip(taRedPacket.getActivityEndTip());
         }
-        responseBean.addSuccess(taRedPacket);
+        responseBean.addSuccess(taRedPacketHelp);
         return responseBean;
     }
 }

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

         SELECT
             t.*,
             t3.audit_status,
-            t3.audit_result,
+            t3.audit_result
         FROM
             ta_org_order t
         INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id AND t2.item_type = 'refund'
             <if test=" auditStatus != null and auditStatus != ''">
                 AND t3.audit_status = #{auditStatus}
             </if>
-            <if test=" refundStartTime!= null">
+            <if test=" refundStartTime != null">
                 AND t.create_date &gt;= #{refundStartTime}
             </if>
             <if test=" refundEndTime != null">
             <if test = " orderId != null and orderId != ''">
                 AND t.order_id like concat( '%',#{orderId},'%')
             </if>
-            <if test = " tradeNo != null and tradeNo != ''">
-                AND t.trade_no like concat( '%',#{tradeNo},'%')
-            </if>
-            <if test = " wxOrderId != null and wxOrderId != ''">
-                AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
-            </if>
             <if test = " startTime != null ">
                 AND t.create_date &gt;= #{startTime}
             </if>
-            <if test = " entartTime != null and">
-                AND t.create_date &lt;= #{entartTime}
+            <if test = " endTime != null">
+                AND t.create_date &lt;= #{endTime}
             </if>
             <if test = " status != null">
                 AND t2.status = #{status}
             <if test = " orderId != null and orderId != ''">
                 AND t.order_id like concat( '%',#{orderId},'%')
             </if>
-            <if test = " tradeNo != null and tradeNo != ''">
-                AND t.trade_no like concat( '%',#{tradeNo},'%')
-            </if>
-            <if test = " wxOrderId != null and wxOrderId != ''">
-                AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
-            </if>
             <if test = " startTime != null ">
                 AND t.create_date &gt;= #{startTime}
             </if>
-            <if test = " entartTime != null and">
-                AND t.create_date &lt;= #{entartTime}
+            <if test = " endTime != null">
+                AND t.create_date &lt;= #{endTime}
             </if>
             <if test = " status != null">
                 AND t2.status = #{status}