hurui
/
puhui-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://gitea.dctpay.com/hurui/puhui-go into dev

Browse Source
master
袁野 3 months ago
parent fd6d8e69dd 767196f24e
commit 9285ee697f
37 changed files with 243 additions and 179 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      bweb/src/main/java/com/bweb/controller/BsUserController.java
  2. 1
      bweb/src/main/java/com/bweb/controller/SecUserController.java
  3. 62
      bweb/src/main/java/com/bweb/controller/TestController.java
  4. 4
      cweb/src/main/java/com/cweb/controller/CommonController.java
  5. 6
      cweb/src/main/java/com/cweb/controller/goods/GoodsController.java
  6. 4
      cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java
  7. 10
      cweb/src/main/java/com/cweb/controller/qianZhu/StarbucksController.java
  8. 2
      cweb/src/main/resources/prod/logback.xml
  9. 5
      order/src/main/java/com/order/controller/OrderController.java
  10. 16
      order/src/main/java/com/order/controller/OrderPayController.java
  11. 7
      order/src/main/java/com/order/controller/business/BsOrderCinemaController.java
  12. 9
      order/src/main/java/com/order/controller/business/BsOrderGoodsController.java
  13. 22
      order/src/main/java/com/order/controller/business/BsOrderStarbucksController.java
  14. 5
      order/src/main/java/com/order/controller/business/OrderCouponController.java
  15. 2
      order/src/main/resources/dev/logback.xml
  16. 2
      order/src/main/resources/prod/logback.xml
  17. 3
      schedule/src/main/java/com/hfkj/schedule/OrderGoodsSchedule.java
  18. 36
      service/src/main/java/com/hfkj/common/utils/CommonUtil.java
  19. 65
      service/src/main/java/com/hfkj/common/utils/HttpsUtils.java
  20. 2
      service/src/main/java/com/hfkj/dao/BsOrderCouponMapperExt.java
  21. 4
      service/src/main/java/com/hfkj/model/order/OrderCouponModel.java
  22. 4
      service/src/main/java/com/hfkj/model/order/orderExport/OrderGoodsExportModel.java
  23. 9
      service/src/main/java/com/hfkj/qianzhu/CinemaService.java
  24. 2
      service/src/main/java/com/hfkj/qianzhu/KfcService.java
  25. 2
      service/src/main/java/com/hfkj/qianzhu/QianZhuService.java
  26. 3
      service/src/main/java/com/hfkj/qianzhu/StarbucksService.java
  27. 4
      service/src/main/java/com/hfkj/service/coupon/impl/BsOrderCouponServiceImpl.java
  28. 4
      service/src/main/java/com/hfkj/service/goods/impl/BsOrderCinemaServiceImpl.java
  29. 5
      service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java
  30. 4
      service/src/main/java/com/hfkj/service/goods/impl/BsOrderStarbucksServiceImpl.java
  31. 14
      service/src/main/java/com/hfkj/service/order/OrderCreateService.java
  32. 5
      service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java
  33. 10
      service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java
  34. 4
      service/src/main/java/com/hfkj/service/order/impl/BsOrderChildServiceImpl.java
  35. 7
      service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java
  36. 18
      service/src/main/java/com/hfkj/service/pay/huift/TradeService.java
  37. 4
      service/src/main/java/com/hfkj/service/pay/huift/config/HuiftConfig.java

16
bweb/src/main/java/com/bweb/controller/BsUserController.java
Unescape View File

@ -65,22 +65,6 @@ public class BsUserController {
@Resource
private BsUserComplaintService userComplaintService;
@Resource
private PhgDataUserService phgDataUserService;
@Resource
private BsUserCardService userCardService;
@Resource
private CommonService commonService;
@Resource
private GoodsUserAddressService goodsUserAddressService;
@Resource
private GoodsSpecsService goodsSpecsService;
@Resource
private GoodsVpdService goodsVpdService;
@RequestMapping(value="/restore",method = RequestMethod.POST)
@ResponseBody

1
bweb/src/main/java/com/bweb/controller/SecUserController.java
Unescape View File

@ -73,6 +73,7 @@ public class SecUserController {
secUser.setUserName(body.getString("userName"));
secUser.setLoginName(body.getString("loginName"));
secUser.setPlatformCode(body.getString("platformCode"));
secUser.setTelephone(body.getString("telephone"));
secUser.setRoleId(body.getLong("roleId"));
secUserService.editUser(secUser);

62
bweb/src/main/java/com/bweb/controller/TestController.java
Unescape View File

@ -9,6 +9,7 @@ import com.hfkj.common.utils.*;
import com.hfkj.entity.*;
import com.hfkj.meituan.MeiTuanService;
import com.hfkj.model.ResponseData;
import com.hfkj.model.goods.GoodsModel;
import com.hfkj.service.discount.CouponDiscountService;
import com.hfkj.service.goods.BsOrderGoodsService;
import com.hfkj.service.goods.GoodsMsgService;
@ -23,6 +24,7 @@ import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@ -119,17 +121,25 @@ public class TestController {
@RequestMapping(value="/orderGoodsUpdate",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "商品更新")
public ResponseData orderGoodsUpdate() {
public ResponseData orderMsgUpdate() {
try {
List<BsOrderGoods> orderGoodsList = orderGoodsService.getList();
Map<String, Object> map = new HashMap<>();
for (BsOrderGoods goods : orderGoodsList) {
BsOrderChild child = orderChildService.getDetail(goods.getChildOrderNo());
goods.setStatus(child.getStatus());
goods.setUpdateTime(new Date());
orderGoodsService.update(goods);
map.put("status", 1);
List<GoodsMsg> list = goodsMsgService.getList(map);
List<GoodsSpecs> specsList = goodsSpecsService.getList(new HashMap<>());
for (GoodsMsg goodsMsg : list) {
List<GoodsSpecs> goodsSpecsList = specsList.stream().filter(s -> s.getGoodsId().equals(goodsMsg.getId())).collect(Collectors.toList());
if (!goodsSpecsList.isEmpty()) {
goodsMsg.setSaleNum(CommonUtil.saleNumRandom(goodsSpecsList.get(0).getSalePrice()));
}
goodsMsgService.update(goodsMsg);
}
return ResponseMsgUtil.success("成功");
@ -176,38 +186,44 @@ public class TestController {
@RequestMapping(value="/getLogisticsMsg",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询物流")
public ResponseData getLogisticsMsg(@RequestParam(value = "id" , required = false) Long id) {
public ResponseData getLogisticsMsg() {
try {
Map<String, Object> map = new HashMap<>();
Map<String , Object> objectMap = new HashMap<>();
BsOrderGoods orderGoods = bsOrderGoodsService.queryDetail(id);
objectMap.put("status" , 2);
if (orderGoods == null) {
List<BsOrderGoods> orderGoodsList = orderGoodsService.getList(objectMap);
for (BsOrderGoods goods : orderGoodsList) {
if (goods == null) {
throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "暂无物流信息！");
}
GoodsUserAddress userAddress = addressService.queryDetail(orderGoods.getDeliveryAddressId());
GoodsUserAddress userAddress = addressService.queryDetail(goods.getDeliveryAddressId());
if (userAddress == null) {
throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "暂无物流信息！");
}
GoodsLogistics logistics = (GoodsLogistics) bsOrderGoodsService.getLogisticsMsg(orderGoods.getLogisticsNo() , userAddress.getPhone());
if (goods.getLogisticsNo() != null) {
GoodsLogistics logistics = (GoodsLogistics) bsOrderGoodsService.getLogisticsMsg(goods.getLogisticsNo() , userAddress.getPhone());
if (logistics.getLogisticsStatus() != null) {
orderGoods.setLogisticsStatus(logistics.getLogisticsStatus());
orderGoods.setLogisticsStatusDesc(logistics.getLogisticsStatusDesc());
goods.setLogisticsStatus(logistics.getLogisticsStatus());
goods.setLogisticsStatusDesc(logistics.getLogisticsStatusDesc());
} else {
orderGoods.setLogisticsStatus(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getCode());
orderGoods.setLogisticsStatusDesc(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getName());
goods.setLogisticsStatus(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getCode());
goods.setLogisticsStatusDesc(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getName());
}
bsOrderGoodsService.update(orderGoods);
map.put("logistics", logistics);
JSONArray object = JSONArray.parseArray(logistics.getLogisticsTraceDetails());
map.put("logisticsTraceDetails", object);
goods.setUpdateTime(new Date());
bsOrderGoodsService.update(goods);
}
}
return ResponseMsgUtil.success(map);
return ResponseMsgUtil.success("map");
} catch (Exception e) {
log.error("error!",e);

4
cweb/src/main/java/com/cweb/controller/CommonController.java
Unescape View File

@ -11,7 +11,7 @@ import com.hfkj.entity.BsOrderGoods;
import com.hfkj.entity.GoodsLogistics;
import com.hfkj.entity.GoodsUserAddress;
import com.hfkj.model.ResponseData;
import com.hfkj.qianzhu.channel.QianZhuService;
import com.hfkj.qianzhu.QianZhuService;
import com.hfkj.service.CommonService;
import com.hfkj.service.goods.BsOrderGoodsService;
import com.hfkj.service.goods.GoodsUserAddressService;
@ -24,8 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;

6
cweb/src/main/java/com/cweb/controller/goods/GoodsController.java
Unescape View File

@ -130,6 +130,7 @@ public class GoodsController {
map.put("status", 1);
List<GoodsMsg> list = goodsMsgService.getList(map);
List<GoodsSpecs> specsList = goodsSpecsService.getList(new HashMap<>());
List<GoodsModel> goodsModels = new ArrayList<>();
@ -137,10 +138,8 @@ public class GoodsController {
GoodsModel goodsModel = new GoodsModel();
Map<String , Object> mapSpecs = new HashMap<>();
mapSpecs.put("goodsId" , goodsMsg.getId());
List<GoodsSpecs> goodsSpecs = specsList.stream().filter(s -> s.getGoodsId().equals(goodsMsg.getId())).collect(Collectors.toList());
List<GoodsSpecs> goodsSpecs = goodsSpecsService.getList(mapSpecs);
if (!goodsSpecs.isEmpty()) {
BigDecimal minPrice = goodsSpecs.get(0).getSalePrice();
BigDecimal minOriginalPrice = goodsSpecs.get(0).getOriginalPrice();
@ -169,7 +168,6 @@ public class GoodsController {
}
}
return ResponseMsgUtil.success(PageUtil.initPageInfoObj(pageNum, goodsModels.size(), pageSize, new PageInfo<>(goodsModels)));
} catch (Exception e) {

4
cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java
Unescape View File

@ -11,13 +11,11 @@ import com.hfkj.common.utils.PageUtil;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.BsProductConfig;
import com.hfkj.model.ResponseData;
import com.hfkj.model.goods.GoodsModel;
import com.hfkj.qianzhu.channel.CinemaService;
import com.hfkj.qianzhu.CinemaService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jacoco.agent.rt.internal_035b120.core.internal.flow.IFrame;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;

10
cweb/src/main/java/com/cweb/controller/qianZhu/StarbucksController.java
Unescape View File

@ -2,14 +2,13 @@ package com.cweb.controller.qianZhu;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hfkj.common.utils.PageUtil;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.common.utils.StarbucksUtil;
import com.hfkj.entity.BsProductConfig;
import com.hfkj.model.ResponseData;
import com.hfkj.qianzhu.channel.StarbucksService;
import com.hfkj.qianzhu.StarbucksService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
import io.swagger.annotations.Api;
@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
@ -94,6 +92,10 @@ public class StarbucksController {
BigDecimal tallPrice = StarbucksUtil.calculatePrice(productConfig.getDiscount() , item.getBigDecimal("salesTallPrice"));
List<BigDecimal> priceList = new ArrayList<>();
List<BigDecimal> priceListOriginal = new ArrayList<>();
priceListOriginal.add(item.getBigDecimal("marketTallPrice"));
priceListOriginal.add(item.getBigDecimal("marketGrandePrice"));
priceListOriginal.add(item.getBigDecimal("marketVentiPrice"));
// 判断如果卖家 大于 原价 展示原价
if (tallPrice.compareTo(item.getBigDecimal("marketTallPrice")) > 0) {
item.put("tallPrice" , item.getBigDecimal("marketTallPrice"));
@ -124,7 +126,9 @@ public class StarbucksController {
}
Collections.sort(priceList);
Collections.sort(priceListOriginal);
item.put("tallPrice" ,priceList.get(0));
item.put("tallOriginalPrice" ,priceListOriginal.get(0));
List<JSONObject> dataList = new ArrayList<>();

2
cweb/src/main/resources/prod/logback.xml
Unescape View File

@ -88,7 +88,7 @@
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<logger name="com.hfkj.qianzhu.channel.QianZhuService" level="INFO">
<logger name="com.hfkj.qianzhu.QianZhuService" level="INFO">
<appender-ref ref="QianZhuLog" />
</logger>
<!-- 千猪接口 -->

5
order/src/main/java/com/order/controller/OrderController.java
Unescape View File

@ -55,6 +55,7 @@ public class OrderController {
@ApiOperation(value = "创建订单")
public ResponseData create(@RequestBody OrderModel body) {
try {
System.out.println("body" + body.toString());
// 用户session
UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class);
@ -98,11 +99,11 @@ public class OrderController {
@ApiOperation(value = "取消订单")
public ResponseData cancel(@RequestBody JSONObject body) {
try {
if (body == null|| StringUtils.isBlank(body.getString("orderNo"))) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
return ResponseMsgUtil.success(orderService.cancel(body.getString("orderNo"), false));
} catch (Exception e) {
@ -133,6 +134,7 @@ public class OrderController {
@RequestParam(value = "pageNum" , required = true) Integer pageNum,
@RequestParam(value = "pageSize" , required = true) Integer pageSize) {
try {
// 用户session
UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class);
if (userSession == null) {
@ -177,6 +179,7 @@ public class OrderController {
@RequestParam(value = "pageNum" , required = true) Integer pageNum,
@RequestParam(value = "pageSize" , required = true) Integer pageSize) {
try {
Map<String,Object> param = new HashMap<>();
param.put("orderNo", orderNo);
param.put("userPhone", userPhone);

16
order/src/main/java/com/order/controller/OrderPayController.java
Unescape View File

@ -44,6 +44,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.util.Date;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @className: OrderController
@ -190,8 +191,21 @@ public class OrderPayController {
if (merPay == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "商户未配置支付");
}*/
if (order.getOrderChildList().stream().collect(Collectors.groupingBy(OrderChildModel::getProductType, Collectors.toList())).size() > 1) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂不支持合并下单");
}
String shopCode = HuiftConfig.shopcode98;
String signSecret = HuiftConfig.signSecret98;
if (order.getOrderChildList().get(0).getProductType() == 1) {
shopCode = HuiftConfig.shopcode95;
signSecret = HuiftConfig.signSecret95;
}
// 请求支付渠道
JSONObject thirdPreOrder = huiftTradeService.thirdPreOrder(order);
JSONObject thirdPreOrder = huiftTradeService.thirdPreOrder(order , shopCode , signSecret);
for (OrderChildModel orderChild : order.getOrderChildList()) {
orderChild.setSettleAccount(HuiftConfig.shopcode);
orderChild.setSettleAccountKey(HuiftConfig.signSecret);

7
order/src/main/java/com/order/controller/business/BsOrderCinemaController.java
Unescape View File

@ -9,9 +9,8 @@ import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.BsOrderCinema;
import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject;
import com.hfkj.qianzhu.channel.CinemaService;
import com.hfkj.qianzhu.CinemaService;
import com.hfkj.service.goods.BsOrderCinemaService;
import com.hfkj.sysenum.SecUserObjectTypeEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
@ -63,8 +62,8 @@ public class BsOrderCinemaController {
Map<String , Object> map = new HashMap<>();
if (userModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type2.getCode())) {
map.put("merId", userModel.getAccount().getObjectId());
if (userModel.getAccount().getPlatformCode() != null) {
map.put("platformCode", userModel.getAccount().getPlatformCode());
}
map.put("orderNo", orderNo);

9
order/src/main/java/com/order/controller/business/BsOrderGoodsController.java
Unescape View File

@ -100,6 +100,9 @@ public class BsOrderGoodsController {
if (userModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type2.getCode())) {
map.put("merId", userModel.getAccount().getObjectId());
}
if (userModel.getAccount().getPlatformCode() != null) {
map.put("platformCode", userModel.getAccount().getPlatformCode());
}
map.put("logisticsNo", logisticsNo);
map.put("goodsType", goodsType);
@ -153,8 +156,6 @@ public class BsOrderGoodsController {
SecUserSessionObject userModel = (SecUserSessionObject) sessionObject.getObject();
Map<String , Object> map = new HashMap<>();
if (userModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) {
map.put("merId", merId);
@ -163,6 +164,10 @@ public class BsOrderGoodsController {
map.put("merId", userModel.getAccount().getObjectId());
}
if (userModel.getAccount().getPlatformCode() != null) {
map.put("platformCode", userModel.getAccount().getPlatformCode());
}
map.put("logisticsNo", logisticsNo);
map.put("goodsType", goodsType);
map.put("goodsBrand", goodsBrand);

22
order/src/main/java/com/order/controller/business/BsOrderStarbucksController.java
Unescape View File

@ -2,14 +2,18 @@ package com.order.controller.business;
import com.github.pagehelper.PageInfo;
import com.hfkj.common.security.SessionObject;
import com.hfkj.common.security.UserCenter;
import com.hfkj.common.utils.PageUtil;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.BsOrderChild;
import com.hfkj.entity.BsOrderStarbucks;
import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject;
import com.hfkj.model.order.OrderStarbucksModel;
import com.hfkj.service.goods.BsOrderStarbucksService;
import com.hfkj.service.order.BsOrderChildService;
import com.hfkj.sysenum.SecUserObjectTypeEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
@ -42,6 +46,9 @@ public class BsOrderStarbucksController {
@Resource
private BsOrderStarbucksService bsOrderStarbucksService;
@Resource
private UserCenter userCenter;
@RequestMapping(value="/getListStarbucks",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询列表")
@ -61,7 +68,13 @@ public class BsOrderStarbucksController {
@RequestParam(value = "pageSize" , required = true) Integer pageSize, HttpServletRequest request) {
try {
SessionObject sessionObject = userCenter.getSessionObject(request);
SecUserSessionObject userModel = (SecUserSessionObject) sessionObject.getObject();
Map<String , Object> map = new HashMap<>();
map.put("orderNo", orderNo);
map.put("childOrderNo", childOrderNo);
map.put("productType", 4);
@ -72,7 +85,13 @@ public class BsOrderStarbucksController {
map.put("status", status);
List<BsOrderChild> list = bsOrderChildService.getList(map);
List<BsOrderStarbucks> starbucksList = bsOrderStarbucksService.getList(new HashMap<>());
Map<String , Object> map1 = new HashMap<>();
if (userModel.getAccount().getPlatformCode() != null) {
map1.put("platformCode", userModel.getAccount().getPlatformCode());
}
List<BsOrderStarbucks> starbucksList = bsOrderStarbucksService.getList(map1);
List<OrderStarbucksModel> starbucksModelList = new ArrayList<>();
@ -89,7 +108,6 @@ public class BsOrderStarbucksController {
starbucksModel.setPayType(starbucks.get(0).getPayType());
starbucksModelList.add(starbucksModel);
}
}
if (storeAddress != null) {

5
order/src/main/java/com/order/controller/business/OrderCouponController.java
Unescape View File

@ -122,6 +122,11 @@ public class OrderCouponController {
} else if (SecUserObjectTypeEnum.type2.getCode() == userSessionObject.getAccount().getObjectType()) {
param.put("merId", userSessionObject.getAccount().getObjectId());
}
if (userSessionObject.getAccount().getPlatformCode() != null) {
param.put("platformCode", userSessionObject.getAccount().getPlatformCode());
}
param.put("orderNo", orderNo);
param.put("userPhone", userPhone);
param.put("tradeStatus", tradeStatus);

2
order/src/main/resources/dev/logback.xml
Unescape View File

@ -219,7 +219,7 @@
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<logger name="com.hfkj.qianzhu.channel.QianZhuService" level="INFO">
<logger name="com.hfkj.qianzhu.QianZhuService" level="INFO">
<appender-ref ref="QianZhuLog" />
</logger>
<!-- 千猪接口 -->

2
order/src/main/resources/prod/logback.xml
Unescape View File

@ -219,7 +219,7 @@
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<logger name="com.hfkj.qianzhu.channel.QianZhuService" level="INFO">
<logger name="com.hfkj.qianzhu.QianZhuService" level="INFO">
<appender-ref ref="QianZhuLog" />
</logger>
<!-- 千猪接口 -->

3
schedule/src/main/java/com/hfkj/schedule/OrderGoodsSchedule.java
Unescape View File

@ -81,8 +81,8 @@ public class OrderGoodsSchedule {
throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "暂无物流信息！");
}
if (goods.getLogisticsNo() != null) {
GoodsLogistics logistics = (GoodsLogistics) bsOrderGoodsService.getLogisticsMsg(goods.getLogisticsNo() , userAddress.getPhone());
if (logistics.getLogisticsStatus() != null) {
goods.setLogisticsStatus(logistics.getLogisticsStatus());
goods.setLogisticsStatusDesc(logistics.getLogisticsStatusDesc());
@ -94,6 +94,7 @@ public class OrderGoodsSchedule {
goods.setUpdateTime(new Date());
bsOrderGoodsService.update(goods);
}
}
}

36
service/src/main/java/com/hfkj/common/utils/CommonUtil.java
Unescape View File

@ -2,6 +2,7 @@ package com.hfkj.common.utils;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Random;
public class CommonUtil {
@ -16,4 +17,39 @@ public class CommonUtil {
return length + "米";
}
public static Integer saleNumRandom(BigDecimal price){
if (price.compareTo(new BigDecimal(41)) < 0) {
return randomNumberGenerator(3000 , 15000);
}
if (price.compareTo(new BigDecimal(40)) > 0 && price.compareTo(new BigDecimal(200)) < 0) {
return randomNumberGenerator( 500, 3000);
}
if (price.compareTo(new BigDecimal(201)) > 0 && price.compareTo(new BigDecimal(400)) < 0) {
return randomNumberGenerator( 200, 500);
}
if (price.compareTo(new BigDecimal(401)) > 0) {
return randomNumberGenerator( 10, 200);
}
return 0;
}
/**
* @MethodName RandomNumberGenerator
* @Description: 获取区间随机数
* @param min
* @param max
* @return: java.lang.Integer
* @Author: Sum1Dream
* @Date: 2024/9/2 下午4:02
*/
public static Integer randomNumberGenerator(Integer min , Integer max){
Random random = new Random();
return random.nextInt(max - min + 1) + min;
}
}

65
service/src/main/java/com/hfkj/common/utils/HttpsUtils.java
Unescape View File

@ -54,7 +54,7 @@ public class HttpsUtils {
// 设置连接池
connMgr = new PoolingHttpClientConnectionManager();
// 设置连接池大小
connMgr.setMaxTotal(100);
connMgr.setMaxTotal(5000);
connMgr.setDefaultMaxPerRoute(connMgr.getMaxTotal());
// Validate connections after 1 sec of inactivity
connMgr.setValidateAfterInactivity(1000);
@ -100,7 +100,8 @@ public class HttpsUtils {
}
apiUrl += param;
String result = null;
HttpClient httpClient = null;
CloseableHttpClient httpClient;
CloseableHttpResponse response = null;
try {
if (apiUrl.startsWith("https")) {
@ -111,7 +112,7 @@ public class HttpsUtils {
}
HttpGet httpGet = new HttpGet(apiUrl);
HttpResponse response = httpClient.execute(httpGet);
response = httpClient.execute(httpGet);
HttpEntity entity = response.getEntity();
if (entity != null) {
InputStream instream = entity.getContent();
@ -120,48 +121,19 @@ public class HttpsUtils {
return JSON.parseObject(result);
} catch (Exception e) {
log.error(e.getMessage(),e);
}
return null;
}
public static JSONObject doGet(String url, Map<String, String> params , String o) {
String apiUrl = url;
StringBuffer param = new StringBuffer();
int i = 0;
for (String key : params.keySet()) {
if (i == 0)
param.append("?");
else
param.append("&");
param.append(key).append("=").append(params.get(key));
i++;
}
apiUrl += param;
String result = null;
HttpClient httpClient = null;
} finally {
if (response != null) {
try {
if (apiUrl.startsWith("https")) {
httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
.setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
} else {
httpClient = HttpClients.createDefault();
EntityUtils.consume(response.getEntity());
} catch (IOException e) {
log.error(e.getMessage(),e);
}
HttpGet httpGet = new HttpGet(apiUrl);
HttpResponse response = httpClient.execute(httpGet);
HttpEntity entity = response.getEntity();
if (entity != null) {
InputStream instream = entity.getContent();
result = IOUtils.toString(instream, "UTF-8");
}
return JSON.parseObject(result);
} catch (Exception e) {
log.error(e.getMessage(),e);
}
return null;
}
public static JSONObject doGet(String url, Map<String, String> params , Map<String , String> headers) {
String apiUrl = url;
StringBuffer param = new StringBuffer();
@ -176,7 +148,8 @@ public class HttpsUtils {
}
apiUrl += param;
String result = null;
HttpClient httpClient = null;
CloseableHttpClient httpClient = null;
CloseableHttpResponse response = null;
try {
if (apiUrl.startsWith("https")) {
@ -190,7 +163,7 @@ public class HttpsUtils {
for (Map.Entry<String, String> e : headers.entrySet()) {
httpGet.addHeader(e.getKey(), e.getValue());
}
HttpResponse response = httpClient.execute(httpGet);
response = httpClient.execute(httpGet);
HttpEntity entity = response.getEntity();
if (entity != null) {
InputStream instream = entity.getContent();
@ -199,6 +172,14 @@ public class HttpsUtils {
return JSON.parseObject(result);
} catch (Exception e) {
log.error(e.getMessage(),e);
} finally {
if (response != null) {
try {
EntityUtils.consume(response.getEntity());
} catch (IOException e) {
log.error(e.getMessage(),e);
}
}
}
return null;
}
@ -223,7 +204,7 @@ public class HttpsUtils {
* @return
*/
public static JSONObject doPost(String apiUrl, Map<String, Object> params) {
CloseableHttpClient httpClient = null;
CloseableHttpClient httpClient;
if (apiUrl.startsWith("https")) {
httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
.setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();
@ -349,7 +330,7 @@ public class HttpsUtils {
* @return
*/
public static JSONObject doPost(String apiUrl, String str) {
CloseableHttpClient httpClient = null;
CloseableHttpClient httpClient;
if (apiUrl.startsWith("https")) {
httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
.setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build();

2
service/src/main/java/com/hfkj/dao/BsOrderCouponMapperExt.java
Unescape View File

@ -31,6 +31,7 @@ public interface BsOrderCouponMapperExt {
" b.pay_channel payChannel," +
" b.pay_type payType," +
" b.pay_serial_no paySerialNo," +
" b.platform_code platformCode," +
" b.`status` tradeStatus," +
" b.create_time createTime," +
" b.pay_time payTime," +
@ -47,6 +48,7 @@ public interface BsOrderCouponMapperExt {
" <if test='param.merId != null'> and b.mer_id = #{param.merId} </if>" +
" <if test='param.orderNo != null'> and b.order_no like concat('%',#{param.orderNo},'%') </if>" +
" <if test='param.orderChildNo != null'> and b.child_order_no = #{param.orderChildNo} </if>" +
" <if test='param.platformCode != null'> and b.platform_code = #{param.platformCode} </if>" +
" <if test='param.userPhone != null'> and b.user_phone like concat('%',#{param.userPhone},'%') </if>" +
" <if test='param.payType != null'> and b.pay_type = #{param.payType}</if>" +
" <if test='param.tradeStatus != null'> and b.status = #{param.tradeStatus}</if>" +

4
service/src/main/java/com/hfkj/model/order/OrderCouponModel.java
Unescape View File

@ -120,4 +120,8 @@ public class OrderCouponModel {
@ExcelProperty("是否异常")
public String exceptionStatus;
@ColumnWidth(20)
@ExcelProperty("平台")
public String platformCode;
}

4
service/src/main/java/com/hfkj/model/order/orderExport/OrderGoodsExportModel.java
Unescape View File

@ -108,6 +108,10 @@ public class OrderGoodsExportModel {
@ExcelProperty("物流状态")
public String logisticsStatusDesc;
@ColumnWidth(20)
@ExcelProperty("更新时间")
public Date updateTime;
@ColumnWidth(20)
@ExcelProperty("完成时间")
public Date finishTime;

9
service/src/main/java/com/hfkj/qianzhu/channel/CinemaService.java → service/src/main/java/com/hfkj/qianzhu/CinemaService.java
Unescape View File

@ -1,19 +1,12 @@
package com.hfkj.qianzhu.channel;
package com.hfkj.qianzhu;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.entity.BsProductConfig;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
/**
* @ClassName CinemaService

2
service/src/main/java/com/hfkj/qianzhu/channel/KfcService.java → service/src/main/java/com/hfkj/qianzhu/KfcService.java
Unescape View File

@ -1,4 +1,4 @@
package com.hfkj.qianzhu.channel;
package com.hfkj.qianzhu;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.exception.ErrorCode;

2
service/src/main/java/com/hfkj/qianzhu/channel/QianZhuService.java → service/src/main/java/com/hfkj/qianzhu/QianZhuService.java
Unescape View File

@ -1,4 +1,4 @@
package com.hfkj.qianzhu.channel;
package com.hfkj.qianzhu;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;

3
service/src/main/java/com/hfkj/qianzhu/channel/StarbucksService.java → service/src/main/java/com/hfkj/qianzhu/StarbucksService.java
Unescape View File

@ -1,4 +1,4 @@
package com.hfkj.qianzhu.channel;
package com.hfkj.qianzhu;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@ -7,7 +7,6 @@ import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.CommonUtil;
import com.hfkj.common.utils.DateUtil;
import com.mysql.jdbc.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
service/src/main/java/com/hfkj/service/coupon/impl/BsOrderCouponServiceImpl.java
Unescape View File

@ -7,6 +7,7 @@ import com.hfkj.entity.BsOrderCouponExample;
import com.hfkj.model.order.OrderCouponModel;
import com.hfkj.service.coupon.BsOrderCouponService;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -60,6 +61,9 @@ public class BsOrderCouponServiceImpl implements BsOrderCouponService {
if (MapUtils.getLong(param, "createTimeE") != null) {
param.put("createTimeE", DateUtil.date2String(new Date(MapUtils.getLong(param, "createTimeE")), DateUtil.Y_M_D_HMS));
}
if (StringUtils.isNotBlank(MapUtils.getString(param, "platformCode"))) {
param.put("platformCode", MapUtils.getString(param, "platformCode"));
}
return orderCouponMapper.getOrderList(param);
}

4
service/src/main/java/com/hfkj/service/goods/impl/BsOrderCinemaServiceImpl.java
Unescape View File

@ -80,7 +80,9 @@ public class BsOrderCinemaServiceImpl implements BsOrderCinemaService {
if (StringUtils.isNotBlank(MapUtils.getString(map, "userPhone"))) {
criteria.andUserPhoneEqualTo(MapUtils.getString(map, "userPhone"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "platformCode"))) {
criteria.andPlatformCodeEqualTo(MapUtils.getString(map, "platformCode"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "goodsSpecsName"))) {
criteria.andGoodsSpecsNameEqualTo(MapUtils.getString(map, "goodsSpecsName"));
}

5
service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java
Unescape View File

@ -154,6 +154,9 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService {
if (StringUtils.isNotBlank(MapUtils.getString(map, "goodsSpecsName"))) {
criteria.andGoodsSpecsNameEqualTo(MapUtils.getString(map, "goodsSpecsName"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "platformCode"))) {
criteria.andPlatformCodeEqualTo(MapUtils.getString(map, "platformCode"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "goodsName"))) {
criteria.andGoodsNameLike("%"+MapUtils.getString(map, "goodsName")+"%");
@ -268,7 +271,6 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService {
@Override
public void confirmReceipt(Long orderGoodsId) {
BsOrderGoods orderGoods = queryDetail(orderGoodsId);
if (orderGoods == null ||
orderGoods.getStatus() == 1 ||
orderGoods.getStatus() == 5 ||
@ -283,6 +285,7 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService {
orderService.childOrderComplete(orderGoods.getChildOrderNo());
orderGoods.setStatus(OrderChildStatusEnum.status3.getCode());
orderGoods.setUpdateTime(new Date());
orderGoods.setFinishTime(new Date());
update(orderGoods);
// 删除缓存
orderService.cacheDelete(orderGoods.getOrderNo());

4
service/src/main/java/com/hfkj/service/goods/impl/BsOrderStarbucksServiceImpl.java
Unescape View File

@ -77,6 +77,10 @@ public class BsOrderStarbucksServiceImpl implements BsOrderStarbucksService {
criteria.andUserPhoneEqualTo(MapUtils.getString(map, "userPhone"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "platformCode"))) {
criteria.andPlatformCodeEqualTo(MapUtils.getString(map, "platformCode"));
}
if (MapUtils.getLong(map, "createTimeS") != null) {
criteria.andCreateTimeGreaterThanOrEqualTo(new Date(MapUtils.getLong(map, "createTimeS")));
}

14
service/src/main/java/com/hfkj/service/order/OrderCreateService.java
Unescape View File

@ -7,14 +7,12 @@ import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.RandomUtils;
import com.hfkj.common.utils.RedisUtil;
import com.hfkj.common.utils.StarbucksUtil;
import com.hfkj.entity.*;
import com.hfkj.model.order.OrderChildModel;
import com.hfkj.model.order.OrderModel;
import com.hfkj.qianzhu.channel.CinemaService;
import com.hfkj.qianzhu.channel.StarbucksService;
import com.hfkj.service.BsMerService;
import com.hfkj.qianzhu.CinemaService;
import com.hfkj.qianzhu.StarbucksService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.service.coupon.BsOrderCouponNoService;
import com.hfkj.service.coupon.BsOrderCouponService;
@ -26,11 +24,7 @@ import com.hfkj.sysenum.order.*;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
@ -122,6 +116,7 @@ public class OrderCreateService {
orderCoupon.setOrderNo(orderChild.getOrderNo());
orderCoupon.setChildOrderNo(orderChild.getChildOrderNo());
orderCoupon.setMerId(orderChild.getMerId());
orderCoupon.setPlatformCode(businessObj.getString("platformCode"));
orderCoupon.setUserId(order.getUserId());
orderCoupon.setUserPhone(order.getUserPhone());
orderCoupon.setGoodsId(goodsMsg.getId());
@ -226,6 +221,7 @@ public class OrderCreateService {
orderGoods.setOrderNo(orderChild.getOrderNo());
orderGoods.setChildOrderNo(orderChild.getChildOrderNo());
orderGoods.setMerId(orderChild.getMerId());
orderGoods.setPlatformCode(object.getString("platformCode"));
orderGoods.setMerName(goodsMsg.getMerName());
orderGoods.setUserId(order.getUserId());
orderGoods.setUserPhone(order.getUserPhone());
@ -316,6 +312,7 @@ public class OrderCreateService {
bsOrderCinema.setOrderNo(orderChild.getOrderNo());
bsOrderCinema.setChildOrderNo(orderChild.getChildOrderNo());
bsOrderCinema.setMerId(productConfig.getMerId());
bsOrderCinema.setPlatformCode(object.getString("platformCode"));
bsOrderCinema.setUserId(order.getUserId());
bsOrderCinema.setUserPhone(object.getString("phone"));
bsOrderCinema.setImg(data.getString("pic"));
@ -416,6 +413,7 @@ public class OrderCreateService {
bsOrderStarbucks.setOrderNo(orderChild.getOrderNo());
bsOrderStarbucks.setChildOrderNo(orderChild.getChildOrderNo());
bsOrderStarbucks.setMerId(productConfig.getMerId());
bsOrderStarbucks.setPlatformCode(object.getString("platformCode"));
bsOrderStarbucks.setProductId(orderItemObject.getInteger("productId"));
bsOrderStarbucks.setUserId(order.getUserId());
bsOrderStarbucks.setUserPhone(object.getString("phone"));

5
service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java
Unescape View File

@ -9,8 +9,8 @@ import com.hfkj.common.utils.DateUtil;
import com.hfkj.config.CommonSysConst;
import com.hfkj.entity.*;
import com.hfkj.model.order.OrderModel;
import com.hfkj.qianzhu.channel.CinemaService;
import com.hfkj.qianzhu.channel.StarbucksService;
import com.hfkj.qianzhu.CinemaService;
import com.hfkj.qianzhu.StarbucksService;
import com.hfkj.service.coupon.BsOrderCouponNoService;
import com.hfkj.service.coupon.BsOrderCouponService;
import com.hfkj.service.coupon.channel.ChongQingCNPCCouponService;
@ -19,7 +19,6 @@ import com.hfkj.service.coupon.channel.PcytCNPCCouponConfig;
import com.hfkj.service.coupon.channel.PetroConfig;
import com.hfkj.service.goods.*;
import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl;
import com.hfkj.service.goods.impl.GoodsSpecsServiceImpl;
import com.hfkj.service.hlt.HuiLianTongUnionCardService;
import com.hfkj.sysenum.GoodsVpdSourceEnum;
import com.hfkj.sysenum.order.*;

10
service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java
Unescape View File

@ -1,19 +1,12 @@
package com.hfkj.service.order;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.config.CommonSysConst;
import com.hfkj.entity.*;
import com.hfkj.model.order.OrderChildModel;
import com.hfkj.model.order.OrderModel;
import com.hfkj.qianzhu.channel.CinemaService;
import com.hfkj.qianzhu.CinemaService;
import com.hfkj.service.coupon.BsOrderCouponService;
import com.hfkj.service.goods.BsOrderCinemaService;
import com.hfkj.service.goods.BsOrderStarbucksService;
import com.hfkj.service.goods.impl.BsOrderGoodsServiceImpl;
import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
import com.hfkj.sysenum.order.OrderChildStatusEnum;
import org.springframework.beans.factory.annotation.Autowired;
@ -22,7 +15,6 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

4
service/src/main/java/com/hfkj/service/order/impl/BsOrderChildServiceImpl.java
Unescape View File

@ -4,10 +4,9 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.utils.StarbucksUtil;
import com.hfkj.dao.BsOrderChildMapper;
import com.hfkj.dao.GoodsUserAddressMapper;
import com.hfkj.entity.*;
import com.hfkj.model.order.OrderChildModel;
import com.hfkj.qianzhu.channel.StarbucksService;
import com.hfkj.qianzhu.StarbucksService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.service.goods.*;
import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl;
@ -19,7 +18,6 @@ import com.hfkj.sysenum.order.OrderLogisticsStatusEnum;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

7
service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java
Unescape View File

@ -14,19 +14,14 @@ import com.hfkj.entity.*;
import com.hfkj.model.order.OrderChildModel;
import com.hfkj.model.order.OrderModel;
import com.hfkj.mqtopic.OrderTopic;
import com.hfkj.qianzhu.channel.CinemaService;
import com.hfkj.qianzhu.channel.StarbucksService;
import com.hfkj.qianzhu.CinemaService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.service.coupon.BsOrderCouponNoService;
import com.hfkj.service.coupon.BsOrderCouponService;
import com.hfkj.service.discount.CouponDiscountService;
import com.hfkj.service.discount.CouponDiscountUserRelService;
import com.hfkj.service.goods.BsOrderCinemaService;
import com.hfkj.service.goods.BsOrderGoodsService;
import com.hfkj.service.goods.BsOrderStarbucksService;
import com.hfkj.service.order.*;
import com.hfkj.service.user.UserIntegralService;
import com.hfkj.service.user.impl.PhgDataUserServiceImpl;
import com.hfkj.sysenum.UserIntegralRecordOpUserTypeEnum;
import com.hfkj.sysenum.UserIntegralRecordSourceTypeEnum;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;

18
service/src/main/java/com/hfkj/service/pay/huift/TradeService.java
Unescape View File

@ -7,6 +7,7 @@ import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.HttpsUtils;
import com.hfkj.config.CommonSysConst;
import com.hfkj.entity.BsOrder;
import com.hfkj.entity.BsOrderChild;
import com.hfkj.model.order.OrderModel;
import com.hfkj.service.order.BsOrderService;
import com.hfkj.service.pay.huift.config.HuiftConfig;
@ -36,16 +37,16 @@ public class TradeService {
* @return
* @throws Exception
*/
public JSONObject thirdPreOrder(OrderModel order) throws Exception {
public JSONObject thirdPreOrder(OrderModel order , String shopCode , String signSecret) throws Exception {
Map<String,Object> param = new HashMap<>();
param.put("shopCode", HuiftConfig.shopcode);
param.put("shopCode", shopCode);
param.put("outTradeNo", order.getOrderNo());
param.put("transAmt", order.getPayRealPrice().multiply(new BigDecimal("100")).intValue());
param.put("callbackUrl", CommonSysConst.getSysConfig().getDomainName() + "/order/notify/huiftPay");
// param.put("remark", ""); // 备注
// param.put("outAppId", "");
param.put("outRedirectPath", CommonSysConst.getSysConfig().getDomainName()+"/cweb/#/order/order/orderList");
param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, HuiftConfig.signSecret).getBytes()).toLowerCase());
param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, signSecret).getBytes()).toLowerCase());
JSONObject response = HttpsUtils.doPost(HuiftConfig.reqUrl + "/hfq/v1/thirdPay/thirdPreOrder", JSONObject.toJSONString(param));
if (response.getString("status").equals("ok")) {
return response.getJSONObject("data");
@ -59,11 +60,11 @@ public class TradeService {
* @return
* @throws Exception
*/
public JSONObject thirdPayResult(String preOrderNo) throws Exception {
public JSONObject thirdPayResult(String preOrderNo , String shopCode , String signSecret) throws Exception {
Map<String,Object> param = new HashMap<>();
param.put("shopCode", HuiftConfig.shopcode);
param.put("shopCode", shopCode);
param.put("preOrderNo", preOrderNo);
param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, HuiftConfig.signSecret).getBytes()).toLowerCase());
param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, signSecret).getBytes()).toLowerCase());
JSONObject response = HttpsUtils.doPost(HuiftConfig.reqUrl + "/hfq/v1/thirdPay/thirdPayResult", JSONObject.toJSONString(param));
if (response.getString("status").equals("ok")) {
return response.getJSONObject("data");
@ -82,6 +83,7 @@ public class TradeService {
public JSONObject thirdPayRefund(String refundOrderNo, BigDecimal refundPrice, String orderNo) throws Exception {
// 查询订单
BsOrder order = orderService.getOrder(orderNo);
OrderModel orderModel = orderService.getDetail(orderNo);
if (order == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的的订单");
}
@ -93,11 +95,11 @@ public class TradeService {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "支付方式错误");
}
Map<String,Object> param = new HashMap<>();
param.put("shopCode", HuiftConfig.shopcode);
param.put("shopCode", orderModel.getOrderChildList().get(0).getSettleAccount());
param.put("preOrderNo", order.getPayChannelOrderNo());
param.put("outRefundNo", refundOrderNo);
param.put("refundAmt", refundPrice.multiply(new BigDecimal("100")).intValue());
param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, HuiftConfig.signSecret).getBytes()).toLowerCase());
param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, orderModel.getOrderChildList().get(0).getSettleAccountKey()).getBytes()).toLowerCase());
JSONObject response = HttpsUtils.doPost(HuiftConfig.reqUrl + "/hfq/v1/thirdPay/thirdPayRefund", JSONObject.toJSONString(param));
if (response.getString("status").equals("ok")) {
return response.getJSONObject("data");

4
service/src/main/java/com/hfkj/service/pay/huift/config/HuiftConfig.java
Unescape View File

@ -19,6 +19,10 @@ public class HuiftConfig {
public final static String reqUrl = CommonSysConst.getSysConfig().getHuiftReqUrl();
public final static String shopcode = CommonSysConst.getSysConfig().getHuiftShopCode();
public final static String signSecret = CommonSysConst.getSysConfig().getHuiftSignSecret();
public final static String shopcode98 = "20240653-59c4-4181-9157-17fd4b95c3fc";
public final static String signSecret98 = "19C17F9E19B8DDDDF2FD2EE4EA9F6C61";
public final static String shopcode95 = "b4b121b6-ec5c-44e1-a020-d2f21e754b55";
public final static String signSecret95 = "4AA9E79115848B797B53FBD830B402F4";
/**
* 参数排序

Write Preview
Loading…
Cancel
Save