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

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -678,6 +678,11 @@ public class CommConstant {
      */
     public static final String PAY_STATUS_REFUNDED = "refunded";
 
+    /**
+     * 退款异常
+     */
+    public static final String PAY_STATUS_CHANGE = "change";
+
 
     /**
      * 已经取消支付

src/main/java/com/huiju/estateagents/entity/TaRaise.java

@@ -50,12 +50,12 @@ public class TaRaise implements Serializable {
     /**
      * 认筹开始时间
      */
-    private LocalDateTime raiseStartTime;
+    private String raiseStartTime;
 
     /**
      * 认筹结束时间
      */
-    private LocalDateTime raiseEndTime;
+    private String raiseEndTime;
 
     /**
      * 锁房方式 auto自动锁房，manual手动锁房

src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
@@ -24,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+import sun.util.locale.LocaleUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -311,8 +313,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             }
         }
         //判断是否在时间之内
-        LocalDateTime raiseStartTime = taRaise.getRaiseStartTime();
-        LocalDateTime raiseEndTime = taRaise.getRaiseEndTime();
+
+        LocalDateTime raiseStartTime = DateUtils.dayToLocalDateime(taRaise.getRaiseStartTime());
+        LocalDateTime raiseEndTime = DateUtils.dayToLocalDateime(taRaise.getRaiseEndTime());
         LocalDateTime now = LocalDateTime.now();
         if (now.isBefore(raiseStartTime) || now.isAfter(raiseEndTime)){
             return false;

src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

@@ -198,18 +198,39 @@ public class WxPayServiceImpl implements IWxPayService {
         log.info("更新订单{}状态为退款",orderInfo.get("transaction_id"));
         //更新订单状态为退款
         String transactionId = orderInfo.get("transaction_id");
+        Integer raiseRecordId;
+        String personId;
         List<TaOrder> orderList = taOrderMapper.selectList(new QueryWrapper<TaOrder>().eq("transaction_id", transactionId));
         orderList.forEach(e -> {
-            e.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
+            if (orderInfo.get("refund_status").equals(WXPayConstants.SUCCESS)){
+                e.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
+            }
+            if (!orderInfo.get("refund_status").equals(WXPayConstants.SUCCESS)){
+                e.setPayStatus(CommConstant.PAY_STATUS_CHANGE);
+            }
+
             if (null != e.getParentOrderId()){
+
                 //更新认筹单为退款
                 TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectOne(new QueryWrapper<TaRaiseRecord>().eq("order_id", e.getParentOrderId()));
-                taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
+                if (orderInfo.get("refund_status").equals(WXPayConstants.SUCCESS)){
+                    taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
+                }
+                if (!orderInfo.get("refund_status").equals(WXPayConstants.SUCCESS)){
+                    taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_CHANGE);
+                }
+
                 taRaiseRecordMapper.updateById(taRaiseRecord);
                 //更新退款时间
                 e.setPayTime(LocalDateTime.now());
-                //发送订阅消息
-                taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getRaiseId(),"在线选房认筹通知","线上退费成功","点击详情查看认筹单","线上退费成功",false);
+                if (orderInfo.get("refund_status").equals(WXPayConstants.SUCCESS)){
+                    //发送订阅消息
+                    taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getPersonId(),"在线选房认筹通知","线上退费成功","点击详情查看认筹单","线上退费成功",false);
+                }
+                if (!orderInfo.get("refund_status").equals(WXPayConstants.SUCCESS)){
+                    //发送订阅消息
+                    taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getPersonId(),"在线选房认筹通知","线上退费失败","点击详情查看认筹单","请联系置业顾问",false);
+                }
             }
             taOrderMapper.updateById(e);
         });