修改分佣

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderMapper.java

@@ -427,5 +427,6 @@ public interface MerchantOrderMapper extends BaseMapper<MerchantOrder> {
 
 	@Select("SELECT * FROM tb_pluss_merchant_order WHERE mercOrderNo = #{mercOrderNo} limit 1")
     MerchantOrder getByMercOrderNo(String mercOrderNo);
+
 }
 

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantProfitMapper.java

@@ -17,7 +17,7 @@ public interface MerchantProfitMapper extends BaseMapper<MerchantProfit> {
 
     List<MerchantProfit> selectGroupMercProfit(@Param("userIdList") List<Long> userIdList);
 
-    @Select("SELECT SUM(`price`) FROM tb_pluss_merchant_profit WHERE `status` = '1' AND userId = #{userId}")
+    @Select("SELECT SUM(`price`) FROM tb_pluss_merchant_profit WHERE `status` = '5' AND userId = #{userId}")
     BigDecimal selectSumValidProfit(@Param("userId") String userId);
 
     MerchantProfit queryMerchantProfit(MerchantProfit merchantProfit);

pluss-dao-bundle/src/main/resources/mapper/MerchantProfit-sqlmap.xml

@@ -554,8 +554,7 @@
 
 
     <select id="queryMerchantProfitSumPrice" parameterType="java.util.Map" resultType="java.lang.Double">
-        SELECT sum(price) from tb_pluss_merchant_profit profit
-        <where>
+        SELECT sum(price) from tb_pluss_merchant_profit profit where profit.type=5
             <if test="id!= null">
                 and profit.id = #{id}
             </if>
@@ -646,9 +645,6 @@
             <if test="merchantParentPhone!= null">
                 and profit.merchantParentPhone = #{merchantParentPhone}
             </if>
-            <if test="retype!= null">
-                and profit.type !=4
-            </if>
             <if test="recordDate != null">
                 and profit.recordDate = #{recordDate}
             </if>
@@ -658,7 +654,6 @@
             <if test="recordDateEnd != null">
                 and profit.recordDate &lt;= #{recordDateEnd}
             </if>
-        </where>
     </select>