fjr

aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/dao/CouponrecordMapper.java

@@ -18,7 +18,6 @@ import java.util.Map;
 */
 public interface CouponrecordMapper extends GenericDao<Couponrecord> {
 
-<<<<<<< HEAD
     List<Map<String,Object>> CheckCouponDSYList(CouponrecordVo vo);
 
     List<Map<String,Object>> CheckCouponYSYList(CouponrecordVo vo);
@@ -28,13 +27,10 @@ public interface CouponrecordMapper extends GenericDao<Couponrecord> {
     Map<String,Object> checkCouponById(String number);
 
     Map<String,Object> checkCouponDetails(CouponrecordVo vo);
-
-=======
     /**
      * 查询粉丝购药数量
      * @param params
      * @return
      */
     Integer buyingMedicineNumber(Map<String, Object> params);
->>>>>>> a36b917f9562e200889fcced02ed1de0d7aeb745
 }
\ No newline at end of file

aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/dao/CouponrecordMapper.xml

@@ -193,7 +193,6 @@
         where id = #{id,jdbcType=BIGINT}
     </update>
 
-<<<<<<< HEAD
     <select id="CheckCouponYSYList" resultType="map">
         SELECT
         id,number,DATE_FORMAT(create_time,'%Y-%m-%d') create_time,DATE_FORMAT(invalid_date,'%Y-%m-%d') invalid_date,status
@@ -246,13 +245,11 @@
         id,number,DATE_FORMAT(create_time,'%Y-%m-%d') create_time,DATE_FORMAT(invalid_date,'%Y-%m-%d') invalid_date,status,description
         from t_aidea_coupon_record
         where id = #{id}
-=======
     <select id="buyingMedicineNumber" parameterType="java.util.Map" resultType="map">
         SELECT
             SUM(d.number) number
         FROM t_order t
         LEFT JOIN t_order_details d ON t.id = d.order_id
         <include refid="sqlWhere"/>
->>>>>>> a36b917f9562e200889fcced02ed1de0d7aeb745
     </select>
 </mapper>
\ No newline at end of file