'提交代码'

hai-bweb/src/main/java/com/bweb/controller/HighGasController.java

@@ -122,7 +122,7 @@ public class HighGasController {
         }
     }
 
-    @RequestMapping(value="/refuelingOrderRefund",method = RequestMethod.GET)
+    @RequestMapping(value="/refuelingOrderRefund",method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "订单退款")
     public ResponseData refuelingOrderRefund(@RequestBody JSONObject body) {

hai-cweb/src/main/java/com/cweb/controller/HighGasController.java

@@ -121,7 +121,7 @@ public class HighGasController {
         }
     }
 
-    @RequestMapping(value="/refuelingOrderRefund",method = RequestMethod.GET)
+    @RequestMapping(value="/refuelingOrderRefund",method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "订单退款")
     public ResponseData refuelingOrderRefund(@RequestBody JSONObject body) {

hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java

@@ -169,7 +169,7 @@ public class HighOrderController {
                         throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
                     }
                     // 查询门店
-                    HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(childOrder.getId());
+                    HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(childOrder.getGoodsId());
                     if (store == null) {
                         log.error("HighOrderController --> addOrder() error!", "未找到门店信息");
                         throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到门店信息");
@@ -369,7 +369,7 @@ public class HighOrderController {
     @ResponseBody
     @ApiOperation(value = "获取用户订单")
     public ResponseData getUserOrderList(
-            @RequestParam(name = "status", required = false) Integer status,
+            @RequestParam(name = "status", required = false) String status,
             @RequestParam(name = "orderNo", required = false) String orderNo,
             @RequestParam(name = "pageNum", required = true) Integer pageNum,
             @RequestParam(name = "pageSize", required = true) Integer pageSize,

hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java

@@ -95,8 +95,9 @@ public interface HighOrderMapperExt {
     @Select({"<script>" +
             " SELECT" +
             " (select mer.merchant_name from high_merchant mer where EXISTS (select 1 from high_coupon cou where cou.id = a.goods_id and mer.id = cou.merchant_id)) merchantName," +
-            " case a.goods_type when 1 then '卡券' when 2 then '金币充值' end goodsType, " +
+            " case a.goods_type when 1 then '卡券' when 2 then '金币充值' when 2 then '团油充值' end goodsType, " +
             " a.goods_name goodsName, " +
+            " a.goods_type goodsTypeId," +
             " case a.giveaway_type when 1 then '赠送' when 0 then '购买' end giveawayType," +
             " b.order_no orderNo," +
             " b.mem_name memName," +
@@ -110,10 +111,14 @@ public interface HighOrderMapperExt {
             " case a.giveaway_type when 0 then case when b.pay_gold is null then 0 else pay_gold end when 1 then 0 end payGold," +
             " case a.giveaway_type when 0 then b.pay_price when 1 then 0 end payPrice," +
             " case a.giveaway_type when 0 then case when b.pay_gold is not null then convert(b.pay_gold / 100,decimal(10,2)) else b.pay_real_price end when 1 then 0 end payRealPrice," +
-            " case b.order_status when 1 then '待支付' when 2 then '已支付' when 3 then '已完成' when 4 then '已退款' when 5 then '已取消' end orderStatus, " +
+            " case b.order_status when 1 then '待支付' when 2 then '已支付' when 3 then '已完成' when 4 then '已退款' when 5 then '已取消' when 5 then '退款中' when 5 then '退款失败' end orderStatus, " +
+            " b.order_status orderStatusId," +
             " b.create_time createTime," +
             " b.pay_time payTime," +
-            " b.cancel_time cancelTime" +
+            " b.cancel_time cancelTime," +
+            " b.refund_time refundTime," +
+            " b.refund_content refundContent," +
+            " b.refusal_refund_content refusalRefundContent" +
             " FROM" +
             " high_child_order a," +
             " high_order b" +

hai-service/src/main/java/com/hai/model/HighOrderModel.java

@@ -25,6 +25,51 @@ public class HighOrderModel {
     private Date createTime;
     private Date payTime;
     private Date cancelTime;
+    private Date refundTime;
+    private String refundContent;
+    private String refusalRefundContent;
+    private Integer goodsTypeId;
+    private Integer orderStatusId;
+
+    public Integer getOrderStatusId() {
+        return orderStatusId;
+    }
+
+    public void setOrderStatusId(Integer orderStatusId) {
+        this.orderStatusId = orderStatusId;
+    }
+
+    public Date getRefundTime() {
+        return refundTime;
+    }
+
+    public void setRefundTime(Date refundTime) {
+        this.refundTime = refundTime;
+    }
+
+    public String getRefundContent() {
+        return refundContent;
+    }
+
+    public void setRefundContent(String refundContent) {
+        this.refundContent = refundContent;
+    }
+
+    public String getRefusalRefundContent() {
+        return refusalRefundContent;
+    }
+
+    public void setRefusalRefundContent(String refusalRefundContent) {
+        this.refusalRefundContent = refusalRefundContent;
+    }
+
+    public Integer getGoodsTypeId() {
+        return goodsTypeId;
+    }
+
+    public void setGoodsTypeId(Integer goodsTypeId) {
+        this.goodsTypeId = goodsTypeId;
+    }
 
     public String getMerchantName() {
         return merchantName;

hai-service/src/main/java/com/hai/service/impl/BsCompanyServiceImpl.java

@@ -46,7 +46,9 @@ public class BsCompanyServiceImpl implements BsCompanyService {
 		List<BsCompany> companyList = bsCompanyMapper.selectByExample(example);
 		if (companyList != null && companyList.size() != 0) {
 			for (BsCompany company : companyList) {
-				company.setRegionName(commonService.getRegionName(Long.valueOf(company.getRegionId())));
+				if (StringUtils.isNotBlank(company.getRegionId())) {
+					company.setRegionName(commonService.getRegionName(Long.valueOf(company.getRegionId())));
+				}
 			}
 		}
 		return companyList;

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -22,6 +22,7 @@ import javax.annotation.Resource;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Auther: 胡锐
@@ -326,8 +327,13 @@ public class HighOrderServiceImpl implements HighOrderService {
             criteria.andMemIdEqualTo(MapUtils.getLong(map, "memId"));
         }
 
-        if (MapUtils.getInteger(map, "status") != null) {
+        if (MapUtils.getString(map, "status") != null) {
-            criteria.andOrderStatusEqualTo(MapUtils.getInteger(map, "status"));
+            String[] statuses = MapUtils.getString(map, "status").split(",");
+            List<Integer> list = new ArrayList<>();
+            for (String status : statuses) {
+                list.add(Integer.parseInt(status));
+            }
+            criteria.andOrderStatusIn(list);
         }
 
         if (MapUtils.getString(map, "orderNo") != null) {