MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivity.java

@@ -36,6 +36,8 @@ private static final long serialVersionUID=1L;
     private Long startTime;
     /** 结束时间 */
     private Long endTime;
+    /** 活动标识：0正常 1二建考前（新页面） */
+    private Integer activitySign;
     /** 模板ID */
     private Long tempId;
     /** 海报ID */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityGoods.java

@@ -50,6 +50,8 @@ private static final long serialVersionUID=1L;
     private BigDecimal profitTwo;
     /** 三级拥金 */
     private BigDecimal profitThree;
+    /** 位置标签：1上面 2下面 */
+    private Integer placeSign;
 
     /** 机构ID */
     private Long tenantId;

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

@@ -964,7 +964,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean firstPeriod(List<OrderGoodsRefundEditBo> bos) {
+    public Boolean  firstPeriod(List<OrderGoodsRefundEditBo> bos) {
         for(OrderGoodsRefundEditBo bo : bos){
             if(Validator.isEmpty(bo.getPeriodStatus())||Validator.isEmpty(bo.getRefundId())){
                 throw new CustomException("参数不全");

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

@@ -147,6 +147,9 @@ public class OrderInvoiceVo {
 	/** 收票姓名 */
 	@ApiModelProperty("收票姓名")
 	private String consignee;
+	/** 收票电话 */
+	@ApiModelProperty("收票电话")
+	private String collectionTelephone;
 	/** 收票地址 */
 	@ApiModelProperty("收票地址")
 	private String shippingAddress;

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

@@ -133,6 +133,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 order by oi.create_time DESC limit 1
                 ) = 4
             </if>
+            <if test="invoiceStatus != null and invoiceStatus == 5">
+                AND (SELECT
+                count(oi.invoice_id)
+                FROM
+                order_invoice_order oio
+                LEFT JOIN order_invoice oi ON oio.invoice_id = oi.invoice_id
+                WHERE
+                oio.order_sn = u.handle_order_sn
+                AND (oi.wash_status is null or oi.wash_status = 1)
+                ) = 0
+            </if>
         ORDER BY u.create_time DESC
     </select>
 

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

@@ -202,6 +202,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="invoiceStatus != null and invoiceStatus == 3">
                 AND oi.period_status = 2
             </if>
+            <if test="invoiceStatus != null and invoiceStatus == 4">
+                AND oi.invoice_status = 4
+            </if>
             <if test="washStatus != null">
                 AND oi.wash_status = #{washStatus}
             </if>