提交代码

dev
胡锐 5 months ago
parent 521783d82a
commit b6d2547181
  1. 38
      order/src/main/java/com/order/controller/business/OrderCouponController.java
  2. 2
      service/src/main/java/com/hfkj/service/hlt/HuiLianTongUnionCardService.java
  3. 5
      service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java
  4. 2
      service/src/main/java/com/hfkj/service/order/impl/OrderPayServiceImpl.java

@ -8,6 +8,7 @@ import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.BsOrderCoupon;
import com.hfkj.model.ResponseData;
import com.hfkj.model.order.OrderCouponModel;
import com.hfkj.service.coupon.BsOrderCouponNoService;
import com.hfkj.service.coupon.BsOrderCouponService;
import io.swagger.annotations.Api;
@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@ -116,6 +118,42 @@ public class OrderCouponController {
}
}
@RequestMapping(value="/export",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询交易订单列表")
public ResponseData export(@RequestParam(value = "orderNo" , required = false) String orderNo,
@RequestParam(value = "userPhone" , required = false) String userPhone,
@RequestParam(value = "tradeStatus" , required = false) Integer tradeStatus,
@RequestParam(value = "goodsName" , required = false) String goodsName,
@RequestParam(value = "payType" , required = false) Integer payType,
@RequestParam(value = "channelOrderNo" , required = false) String channelOrderNo,
@RequestParam(value = "couNo" , required = false) String couNo,
@RequestParam(value = "couStatus" , required = false) Integer couStatus,
@RequestParam(value = "createTimeS" , required = false) Long createTimeS,
@RequestParam(value = "createTimeE" , required = false) Long createTimeE) {
try {
Map<String,Object> param = new HashMap<>();
param.put("orderNo", orderNo);
param.put("userPhone", userPhone);
param.put("tradeStatus", tradeStatus);
param.put("goodsName", goodsName);
param.put("payType", payType);
param.put("channelOrderNo", channelOrderNo);
param.put("couNo", couNo);
param.put("couStatus", couStatus);
param.put("createTimeS", createTimeS);
param.put("createTimeE", createTimeE);
List<OrderCouponModel> orderList = orderCouponService.getOrderList(param);
return ResponseMsgUtil.success(orderList);
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}

@ -151,7 +151,7 @@ public class HuiLianTongUnionCardService {
dataMap.put("cardNo", cardNo);
dataMap.put("checkPassword", "N");
dataMap.put("tranAmount", tranAmount);
dataMap.put("tranChannel", "HiSen");
dataMap.put("tranChannel", "HiSen_phg");
dataMap.put("businessType", businessType);
dataMap.put("instCode", instCode);
dataMap.put("goodsDesc", goodsDesc);

@ -241,6 +241,11 @@ public class BsOrderServiceImpl implements BsOrderService {
orderChildService.editData(childOrder);
}
// TODO 临时多商户支付功能限制
if (order.getOrderChildList().stream().collect(Collectors.groupingBy(BsOrderChild::getMerId, Collectors.toList())).size() > 1) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂不支持多商户商品下单");
}
// 订单入库
editData(order);

@ -34,7 +34,7 @@ public class OrderPayServiceImpl implements OrderPayService {
String goodsDesc = "";
String tranDesc = "";
String instCode = "11101527";
String businessType = "hisen_consume";
String businessType = "HiSen_phg_goods";
for (OrderChildModel orderChild : order.getOrderChildList()) {
if (StringUtils.isBlank(tranDesc)) {

Loading…
Cancel
Save