Merge remote-tracking branch 'origin/dev' into dev

share-system/src/main/java/share/system/mapper/SCouponMapper.java

@@ -64,4 +64,6 @@ public interface SCouponMapper
     List<SCoupon> selectSCouponByIds(Long[] couponIds);
 
     List<SCoupon> listDuration(SCoupon sCoupon);
+
+    List<SCoupon> selectSCouponByDealgroupId(Long dealgroupId);
 }

share-system/src/main/java/share/system/service/ISCouponService.java

@@ -71,4 +71,6 @@ public interface ISCouponService
     List<SCoupon> queryShopDeal();
 
     List<SCoupon> listDuration(SCoupon sCoupon);
+
+    List<SCoupon> selectSCouponByDealgroupId(Long dealgroupId);
 }

share-system/src/main/java/share/system/service/impl/QPServiceImpl.java

@@ -144,10 +144,10 @@ public class QPServiceImpl implements QPService {
 
             }
         });
-        List<SCoupon> sCoupons = isCouponService.selectSCouponByName(prepare.getDeal_title());
+        List<SCoupon> sCoupons = isCouponService.selectSCouponByDealgroupId(prepare.getDealgroup_id());
         SCoupon sCoupon = null;
         if (!CollectionUtils.isEmpty(sCoupons)) {
-            sCoupon = isCouponService.selectSCouponByName(prepare.getDeal_title()).get(0);
+            sCoupon = sCoupons.get(0);
         }
         if (ObjectUtils.isEmpty(sCoupon)) {
             sConsumerCoupon.setCouponType(CouponTypeEnum.CASH.getCode());

share-system/src/main/java/share/system/service/impl/SCouponServiceImpl.java

@@ -45,7 +45,7 @@ public class SCouponServiceImpl implements ISCouponService {
     //默认优惠开始（有效）时段
     private static final String DEFAULT_START_TIME = "00:00";
     //默认优惠结束（有效）时段
-    private static final String DEFAULT_END_TIME = "24:00";
+    private static final String DEFAULT_END_TIME = "23:00";
 
 
     /**
@@ -202,4 +202,9 @@ public class SCouponServiceImpl implements ISCouponService {
     public List<SCoupon> listDuration(SCoupon sCoupon) {
         return sCouponMapper.listDuration(sCoupon);
     }
+
+    @Override
+    public List<SCoupon> selectSCouponByDealgroupId(Long dealgroupId) {
+        return sCouponMapper.selectSCouponByDealgroupId(dealgroupId);
+    }
 }

share-system/src/main/resources/mapper/system/SCouponMapper.xml

@@ -101,6 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="endDate != null">and end_date >= NOW()</if>
 
     </select>
+    <select id="selectSCouponByDealgroupId" resultMap="SCouponResult">
+        <include refid="selectSCouponVo"/>
+        where dealgroup_id = #{dealgroupId}
+    </select>
 
     <insert id="insertSCoupon" parameterType="SCoupon" useGeneratedKeys="true" keyProperty="id">
         insert into s_coupon