fix 字段更换

netflix-dao/src/main/java/com/cyksj/model/entity/OrderDon.java

@@ -146,6 +146,11 @@ public class OrderDon extends BaseEntity implements Serializable {
      */
     private Long dsPopularizeId;
 
+    /**
+     * cps后台推广id
+     */
+    private Long cpsPopularizeId;
+
     /**
      * 自定义订阅节点
      */

netflix-dao/src/main/java/com/cyksj/model/views/UserDistributePopularizeView.java

@@ -18,7 +18,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "(select id,name,remark,code,created_time from user_distribute_popularize where deleted is true :userId:) dp left join order_don od on od.ds_popularize_id = dp.id" +
+@SearchBean(tables = "(select id,name,remark,code,created_time from user_distribute_popularize where deleted is true :userId:) dp left join order_don od on od.cps_popularize_id = dp.id" +
 		" and od.status not in ('close','noPayment') and od.relation_id != 0 and is_fixed_distribute is true" +
 		" left join distribute_waiting_send_points dsp on dsp.order_id = od.id and dsp.send_status in ('success','waiting')",
 		groupBy = "dp.id,dp.name,dp.code,dp.remark,dp.created_time")

netflix-dao/src/main/resources/mapper/UserDistributePopularizeMapper.xml

@@ -8,7 +8,7 @@
         from (select user_id from user_distribute_shared where shared_id = #{cpsUserId}) us
                  inner join order_don od
                             on od.user_id = us.user_id and od.status not in ('close', 'noPayment') and
-                               od.is_fixed_distribute is true and od.ds_popularize_id = 0
+                               od.is_fixed_distribute is true and od.cps_popularize_id = 0
                  inner join distribute_waiting_send_points dp on dp.order_id = od.id
             and dp.send_status in ('success', 'waiting')
     </select>

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -359,7 +359,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					UserDistribute userDistribute = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class).eq(UserDistribute::getUserId, userDistributeShared.getSharedId()));
 					if (userDistribute != null) {
 						orderDon.setIsFixedDistribute(true);
-						orderDon.setDsPopularizeId(userDistributeShared.getDsPopularizeId());
+						orderDon.setCpsPopularizeId(userDistributeShared.getDsPopularizeId());
 					}
 				}
 			}
@@ -761,7 +761,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				UserDistribute userDistribute = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class).eq(UserDistribute::getUserId, userDistributeShared.getSharedId()));
 				if (userDistribute != null) {
 					orderDon.setIsFixedDistribute(true);
-					orderDon.setDsPopularizeId(userDistributeShared.getDsPopularizeId());
+					orderDon.setCpsPopularizeId(userDistributeShared.getDsPopularizeId());
 				}
 			}
 		}