Merge branch 'pre' into 'master'

Pre

See merge request !184

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/carefullyGoods.html

@@ -215,8 +215,8 @@
                     creatDom(1);
                     return;
                 }
-                $("input[name="+data[0].orderType+"]").attr('checked', true).parent().siblings().children().removeAttr('checked');
-                
+                $("input[name='optionsRadios'][value="+data[0].orderType+"]").attr('checked', 'checked').parent().siblings().children().removeAttr('checked');
+                // $("input[name='selectType'][value='1']").attr("checked", "checked").siblings().removeAttr('checked');
                 createTime = data[0].createTime;
                 mid = data[0].mid;
                 selectGoodsId = data[0].selectGoodsId;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinCouponImpl.java

@@ -110,17 +110,22 @@ public class GoblinCouponImpl implements GoblinCouponService {
         List<GoblinUserCouponVo> returnList = ObjectUtil.getGoblinUserCouponVo();
 //        HashMap<String, String> storeIdNameMap = CollectionUtil.mapStringString();
 //        GoblinStoreInfoVo storeInfoVoTmp;
+        LocalDateTime now = LocalDateTime.now();
         for (GoblinUserCouponVo vo : voList) {
 //            if (StringUtils.isNotEmpty(vo.getStoreId())) {
 //                storeInfoVoTmp = goblinRedisUtils.getStoreInfoVo(vo.getStoreId());
 //                vo.setStoreName(storeIdNameMap.getOrDefault(vo.getStoreId(), null == storeInfoVoTmp ? null : storeInfoVoTmp.getStoreName()));
 //            }
             if ("1".equals(type)) {
-                if (vo.getState().equals(1)) {
+                if (vo.getDuedAt().isAfter(now) && vo.getState().equals(1)) {
                     returnList.add(vo);
                 }
             } else {
-                if (vo.getState().equals(3) || vo.getState().equals(5)) {
+                if (vo.getDuedAt().isBefore(now) || vo.getState().equals(3)) {
+                    vo.setState(3);
+                    returnList.add(vo);
+                }
+                if (vo.getState().equals(5)) {
                     returnList.add(vo);
                 }
             }
@@ -134,9 +139,11 @@ public class GoblinCouponImpl implements GoblinCouponService {
         BigDecimal maxPrice = BigDecimal.ZERO;
         GoblinUserCouponVo returnVo = GoblinUserCouponVo.getNew();
         List<GoblinUserCouponVo> voList = goblinRedisUtils.getUserCouponVos(uid);
+
+        LocalDateTime now = LocalDateTime.now();
         for (GoblinUserCouponVo vo : voList) {
             //判断券状态 和 触发金额
-            if (vo.getState().equals(1) && vo.getTriggers().compareTo(totalPrice) <= 0 && vo.getStoreId().equals(storeId)) {
+            if (vo.getDuedAt().isAfter(now) && vo.getState().equals(1) && vo.getTriggers().compareTo(totalPrice) <= 0 && vo.getStoreId().equals(storeId)) {
                 if (vo.getUseScope().equals("0")) {
                     BigDecimal tempPrice = BigDecimal.ZERO;
                     if (vo.getType().equals("1")) {//代金券
@@ -189,9 +196,11 @@ public class GoblinCouponImpl implements GoblinCouponService {
     public List<GoblinUserCouponVo> useList(BigDecimal totalPrice, String spuId, String uid) {
         List<GoblinUserCouponVo> voList = goblinRedisUtils.getUserCouponVos(uid);
         List<GoblinUserCouponVo> returnList = ObjectUtil.getGoblinUserCouponVo();
+
+        LocalDateTime now = LocalDateTime.now();
         for (GoblinUserCouponVo vo : voList) {
             //判断券状态 和 触发金额
-            if (vo.getState().equals(1) && vo.getTriggers().compareTo(totalPrice) <= 0) {
+            if (vo.getDuedAt().isAfter(now) && vo.getState().equals(1) && vo.getTriggers().compareTo(totalPrice) <= 0) {
                 if (vo.getUseScope().equals("0")) {
                     returnList.add(vo);
                 } else {
@@ -220,10 +229,12 @@ public class GoblinCouponImpl implements GoblinCouponService {
         GoblinUseResultVo returnVo = GoblinUseResultVo.getNew();
         returnVo.setValue(BigDecimal.ZERO);
         returnVo.setCouType("-1");
+
+        LocalDateTime now = LocalDateTime.now();
         for (GoblinUserCouponVo vo : voList) {
             if (vo.getUcouponId().equals(ucouponId)) {
                 //判断券状态 和 触发金额
-                if ((vo.getState().equals(1)) && vo.getTriggers().compareTo(totalPrice) <= 0) {
+                if (vo.getDuedAt().isAfter(now) && vo.getState().equals(1) && vo.getTriggers().compareTo(totalPrice) <= 0) {
                     if (vo.getUseScope().equals("0")) {
                         if (vo.getType().equals("1")) {//代金券
                             returnVo.setValue(vo.getValFace());

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinOrderUtils.java

@@ -194,8 +194,9 @@ public class GoblinOrderUtils {
             GoblinUseResultVo returnVo = GoblinUseResultVo.getNew();
             returnVo.setValue(BigDecimal.ZERO);
             returnVo.setCouType("-1");
+            LocalDateTime now = LocalDateTime.now();
             for (GoblinUserCouponVo vo : voList) {
-                if (vo.getUcouponId().equals(ucouponId)) {
+                if (vo.getUcouponId().equals(ucouponId) && vo.getDuedAt().isAfter(now)) {
                     //判断券状态 和 触发金额
                     if ((vo.getState().equals(1)) && vo.getTriggers().compareTo(totalPrice) <= 0) {
                         if (vo.getUseScope().equals("0")) {