喻健
2018-11-30 3d3a9b46b56ded968b1803456470b5ec31e43ce7
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -54,6 +54,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
@@ -896,7 +897,6 @@
            // 单笔收益金额
            BigDecimal money = hongBao.getMoney();
            
            BigDecimal payMoney = hongBao.getPayMoney();
            
            map.put("getTime",getTime);
            
@@ -909,13 +909,31 @@
            /*  订单状态判断:1 订单已付款   2、订单已结算   4、订单失效    */
            if (state == HongBao.STATE_SHIXIAO) {
               map.put("orderState",4); // 订单失效
            } else if (state == HongBao.STATE_BUKELINGQU || state == HongBao.STATE_KELINGQU) {
               if (preGettime != null && preGettime > 0) {
                  map.put("orderState",2); // 订单结算
            } else if (state == HongBao.STATE_BUKELINGQU) {
               Integer orderState = null;
               if (type == HongBao.TYPE_SHARE_GOODS) {
                  // 分享订单
                  Long hongbaoId = hongBao.getId();
                  PidOrder pidOrder = pidOrderService.getPidOrderByHongBaoId(hongbaoId);
                  String pidstate = pidOrder.getState();
                  if ("订单付款".equals(pidstate)) {
                     orderState = 1;
                  } else if ("订单结算".equals(pidstate)) {
                     orderState = 2;
                  } else if ("订单失效".equals(pidstate)) {
                     orderState = 4;
                  }
               } else {
                  map.put("orderState",1); // 订单已付款
                  if (preGettime != null && preGettime > 0) {
                     orderState = 2; // 订单结算
                  } else {
                     orderState = 1; // 订单已付款
                  }
               }
            } else {
               map.put("orderState",orderState);
            } else if (state == HongBao.STATE_KELINGQU || state == HongBao.STATE_YILINGQU) {
               map.put("orderState",2); // 订单结算
            }