提交代码

dev
胡锐 3 months ago
parent c387fd4168
commit 972600aee2
  1. 12
      cweb/src/main/java/com/cweb/controller/CommonController.java
  2. 8
      service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java

@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@ -52,12 +53,12 @@ public class CommonController {
@ApiOperation(value = "test")
public ResponseData test() {
try {
/* String goodsDesc = "";
/* String goodsDesc = "";
String tranDesc = "";
String businessType = "HiSen_phg_goods";
String instCode = "11101608";
String instCode = "11101667";
// 工会卡支付
JSONObject consumption = HuiLianTongUnionCardService.consumption("240803201355633339_1", "8800030115015087807", new BigDecimal("27.40"), businessType, instCode, goodsDesc, tranDesc);
JSONObject consumption = HuiLianTongUnionCardService.consumption("2024122414280943330_01", "8800030115015124584", new BigDecimal("198"), businessType, instCode, goodsDesc, tranDesc);
if (!consumption.getString("respCode").equals("0000")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumption.getString("respMessage"));
}
@ -65,10 +66,9 @@ public class CommonController {
JSONObject consumptionResult = HuiLianTongUnionCardService.resolveResponse(consumption.getString("data"));
if (consumptionResult.getBoolean("success") != true) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumptionResult.getString("message"));
}
*/
}*/
String refundOrderNo = "R" + DateUtil.date2String(new Date(), DateUtil.YMDHMS);
JSONObject refundObj = HuiLianTongUnionCardService.refund(refundOrderNo, "241227092905479836");
JSONObject refundObj = HuiLianTongUnionCardService.refund(refundOrderNo, "250105112754953629");
if (!refundObj.getString("respCode").equals("0000")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, refundObj.getString("respMessage"));
}

@ -6,9 +6,7 @@ import com.hfkj.common.exception.BaseException;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.DateUtil;
import com.hfkj.common.utils.RandomUtils;
import com.hfkj.common.utils.RedisUtil;
import com.hfkj.common.utils.*;
import com.hfkj.dao.BsOrderMapper;
import com.hfkj.entity.*;
import com.hfkj.jd.JdService;
@ -137,8 +135,8 @@ public class BsOrderServiceImpl implements BsOrderService {
/************** 处理业务 ***************/
for (OrderChildModel child : order.getOrderChildList()) {
child.setOrderNo(order.getOrderNo());
// 子订单号 交易id + 4位随机数
child.setChildOrderNo(order.getId()+RandomUtils.number(4, false));
// 子订单号 交易id + 线程随机数 + 4位随机数
child.setChildOrderNo(order.getId()+ IDGenerator.nextId(1) +RandomUtils.number(4, false));
// 提交订单前实物商品处理
if (child.getProductType().equals(OrderChildProductTypeEnum.type1.getCode())) {
child = orderCreateService.goods(order, child);

Loading…
Cancel
Save