submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderHandleServiceImpl.java

@@ -143,6 +143,8 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
                         item.setInvoiceStatus(invoice.getPeriodStatus());
                     } else if (invoice.getPeriodStatus() == 2) {
                         item.setInvoiceStatus(3);
+                    }else {
+                        item.setInvoiceStatus(invoice.getInvoiceStatus());
                     }
                     item.setHandleRemark(invoice.getHandleRemark());
                     item.setInvoiceMode(invoice.getInvoiceMode());
@@ -621,6 +623,7 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
                 if (CollectionUtils.isNotEmpty(list)){
                    iOrderInvoiceService.update(new LambdaUpdateWrapper<OrderInvoice>()
                    .set(OrderInvoice::getWashStatus,1)//带冲红
+                   .set(OrderInvoice::getInvoiceStatus,4)//失效
                    .in(OrderInvoice::getInvoiceId,list.stream().map(OrderInvoiceOrder::getInvoiceId).collect(Collectors.toList())));
                 }
                 break;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderHandleVo.java

@@ -120,6 +120,9 @@ public class OrderHandleVo {
 	@ApiModelProperty("审核意见")
 	private String checkReason;
 
+	@ApiModelProperty("审核时间")
+	private Long checkTime;
+
 	@ApiModelProperty("发票状态：1待审核 2已开票 3不通过")
 	private Integer invoiceStatus;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -5363,7 +5363,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     return true;
                 }
                 TopCourseEducationType educationType = topCourseEducationTypeService.getById(x.getEducationTypeId());
-                if (!businessName.contains(educationType.getEducationName()) && !businessName.contains(educationType.getSchemeName())) {
+                if (!businessName.contains(educationType.getEducationName()) || !businessName.contains(educationType.getSchemeName())) {
                     //教育类型匹配失败
                     return false;
                 }
@@ -5858,7 +5858,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         }
 
                         TopCourseEducationType educationType = topCourseEducationTypeService.getById(item.getEducationTypeId());
-                        if (!businessName.contains(educationType.getEducationName()) && !businessName.contains(educationType.getSchemeName())) {
+                        if (!businessName.contains(educationType.getEducationName()) || !businessName.contains(educationType.getSchemeName())) {
                             //教育类型匹配失败
                             return false;
                         }
@@ -6007,7 +6007,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         }
 
                         TopCourseEducationType educationType = topCourseEducationTypeService.getById(item.getEducationTypeId());
-                        if (!businessName.contains(educationType.getEducationName()) && !businessName.contains(educationType.getSchemeName())) {
+                        if (!businessName.contains(educationType.getEducationName()) || !businessName.contains(educationType.getSchemeName())) {
                             //教育类型匹配失败
                             return false;
                         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -745,7 +745,7 @@ public class WxPayServiceImpl implements IWxPayService {
                 if (item.getEducationTypeId() == -1){return true;}
 
                 TopCourseEducationType educationType = topCourseEducationTypeService.getById(item.getEducationTypeId());
-                if (!businessName.contains(educationType.getEducationName()) && !businessName.contains(educationType.getSchemeName())){
+                if (!businessName.contains(educationType.getEducationName()) || !businessName.contains(educationType.getSchemeName())){
                     //教育类型匹配失败
                     return false;
                 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderHandleMapper.xml

@@ -55,7 +55,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND oh.education_type_id = #{educationTypeId}
         </if>
         <if test="searchKey != null and searchKey != ''">
-            AND (select count(*) from `order` o left JOIN `user` u  on o.user_id = u.user_id left JOIN order_goods og on o.order_sn = og.order_sn LEFT JOIN goods g on og.goods_id = g.goods_id where  o.handle_order_sn = oh.handle_order_sn and (u.realname like concat('%', #{searchKey}, '%') or (u.id_card = #{searchKey,typeHandler=com.zhongzheng.common.type.EncryptHandler}) or (g.goods_name like concat('%', #{searchKey}, '%'))))>0
+            AND (select count(*) from `order` o left JOIN `user` u  on o.user_id = u.user_id
+                left JOIN order_goods og on o.order_sn = og.order_sn
+                LEFT JOIN goods g on og.goods_id = g.goods_id
+            where  o.handle_order_sn = oh.handle_order_sn and (u.realname like concat('%', #{searchKey}, '%') or (u.id_card = #{searchKey,typeHandler=com.zhongzheng.common.type.EncryptHandler}) or (g.goods_name like concat('%', #{searchKey}, '%'))))>0
         </if>
         <if test="goodsType != null">
             AND oh.goods_type = #{goodsType}
@@ -70,10 +73,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND oh.refund_status = #{refundStatus}
         </if>
         <if test="startTime != null and startTime != ''">
-            AND oh.check_time &gt;= #{startTime}
+            AND oh.pay_time &gt;= #{startTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            AND oh.check_time &lt;= #{endTime}
+            AND oh.pay_time &lt;= #{endTime}
         </if>
         <if test="payStatus != null">
             AND oh.pay_status = #{payStatus}
@@ -131,5 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="refundStatus != null and invoiceStatus == 0">
                 AND og.refund_status = 1
             </if>
+            <if test="refundStatus != null and invoiceStatus == null">
+                AND og.refund_status = #{refundStatus}
+            </if>
     </select>
 </mapper>