Merge remote-tracking branch 'origin/master'

# Conflicts:
#	hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
dev-discount
袁野 3 years ago
commit 7e429bc852
  1. 2
      .gitignore
  2. 77
      hai-bweb/src/main/java/com/bweb/controller/HighGasController.java
  3. 42
      hai-bweb/src/main/java/com/bweb/controller/HighMerchantTripartitePlatformController.java
  4. 28
      hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
  5. 2
      hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
  6. 2
      hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java
  7. 2
      hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
  8. 9
      hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java
  9. 132
      hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java
  10. 15
      hai-cweb/src/main/resources/dev/application.yml
  11. 4
      hai-service/pom.xml
  12. 4
      hai-service/src/main/java/com/hai/common/utils/HttpsUtils.java
  13. 39
      hai-service/src/main/java/com/hai/config/MqttProviderCallBack.java
  14. 208
      hai-service/src/main/java/com/hai/config/MqttProviderConfig.java
  15. 219
      hai-service/src/main/java/com/hai/config/PrintDemo.java
  16. 6
      hai-service/src/main/java/com/hai/config/TuanYouConfig.java
  17. 11
      hai-service/src/main/java/com/hai/dao/HighMerchantTripartitePlatformMapper.java
  18. 28
      hai-service/src/main/java/com/hai/dao/HighMerchantTripartitePlatformSqlProvider.java
  19. 11
      hai-service/src/main/java/com/hai/dao/HighOrderMapper.java
  20. 6
      hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
  21. 28
      hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java
  22. 32
      hai-service/src/main/java/com/hai/entity/HighMerchantTripartitePlatform.java
  23. 140
      hai-service/src/main/java/com/hai/entity/HighMerchantTripartitePlatformExample.java
  24. 32
      hai-service/src/main/java/com/hai/entity/HighOrder.java
  25. 120
      hai-service/src/main/java/com/hai/entity/HighOrderExample.java
  26. 18
      hai-service/src/main/java/com/hai/model/GasOrderModel.java
  27. 7
      hai-service/src/main/java/com/hai/service/HighMerchantStoreService.java
  28. 2
      hai-service/src/main/java/com/hai/service/impl/HighGasOilPriceOfficialServiceImpl.java
  29. 4
      hai-service/src/main/java/com/hai/service/impl/HighGasOilPriceTaskServiceImpl.java
  30. 7
      hai-service/src/main/java/com/hai/service/impl/HighMerchantStoreServiceImpl.java
  31. 190
      hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
  32. 66
      hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java
  33. BIN
      v1/target/classes/com/V1Application.class
  34. BIN
      v1/target/classes/com/v1/config/AuthConfig$1.class
  35. BIN
      v1/target/classes/com/v1/config/AuthConfig.class
  36. BIN
      v1/target/classes/com/v1/config/ConfigListener.class
  37. BIN
      v1/target/classes/com/v1/config/CorsConfig.class
  38. BIN
      v1/target/classes/com/v1/config/MultipartConfig.class
  39. BIN
      v1/target/classes/com/v1/config/RedisConfig.class
  40. BIN
      v1/target/classes/com/v1/config/SignatureConfig.class
  41. BIN
      v1/target/classes/com/v1/config/SwaggerConfig.class
  42. BIN
      v1/target/classes/com/v1/config/SysConfig.class
  43. BIN
      v1/target/classes/com/v1/config/SysConst.class
  44. 0
      v1/target/classes/config.properties
  45. BIN
      v1/target/hai-v1-1.0-SNAPSHOT.jar
  46. BIN
      v1/target/hai-v1-1.0-SNAPSHOT.jar.original
  47. 4
      v1/target/maven-archiver/pom.properties
  48. 11
      v1/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  49. 10
      v1/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

2
.gitignore vendored

@ -32,4 +32,6 @@ v1/log/*
v1/hai-schedule.iml
hai-service/hai-service.iml

@ -158,6 +158,7 @@ public class HighGasController {
@ResponseBody
@ApiOperation(value = "查询油站订单列表")
public ResponseData getGasOrderList(@RequestParam(name = "orderNo", required = false) String orderNo,
@RequestParam(name = "storeId", required = false) Long storeId,
@RequestParam(name = "status", required = false) Integer status,
@RequestParam(name = "createTimeS", required = false) Long createTimeS,
@RequestParam(name = "createTimeE", required = false) Long createTimeE,
@ -165,12 +166,44 @@ public class HighGasController {
@RequestParam(name = "pageSize", required = true) Integer pageSize) {
try {
UserInfoModel userInfoModel = userCenter.getSessionModel(UserInfoModel.class);
if (userInfoModel == null || userInfoModel.getMerchantStore() == null) {
if (userInfoModel == null) {
log.error("HighGasController -> disabledOil() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, "");
}
Map<String, Object> param = new HashMap<>();;
param.put("storeId", userInfoModel.getMerchantStore().getId());
// 用户来源 0:超级管理员 1:公司 2:商户 3:门店 4. 代理商 5.充值后台工商 6.团油代理商 7.团油业务员 8. 加油站员工
if (userInfoModel.getSecUser().getObjectType().equals(2)) {
if (storeId != null) {
param.put("storeId", storeId);
} else {
String storeIdStr = "";
List<HighMerchantStore> storeList = merchantStoreService.getStoreListByMer(userInfoModel.getMerchant().getId());
for (HighMerchantStore store : storeList) {
if (StringUtils.isBlank(storeIdStr)) {
storeIdStr += store.getId().toString();
} else {
storeIdStr += "," + store.getId().toString();
}
}
if (StringUtils.isNotBlank(storeIdStr)) {
param.put("storeId", storeIdStr);
} else {
param.put("storeId", 0);
}
}
} else if (userInfoModel.getSecUser().getObjectType().equals(3)) {
param.put("storeId", userInfoModel.getMerchantStore().getId());
} else if (userInfoModel.getSecUser().getObjectType().equals(8)) {
param.put("storeId", userInfoModel.getMerchantStore().getId());
} else {
log.error("HighGasController -> disabledOil() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, "");
}
param.put("orderNo", orderNo);
param.put("createTimeS", createTimeS);
param.put("createTimeE", createTimeE);
@ -226,17 +259,51 @@ public class HighGasController {
@ResponseBody
@ApiOperation(value = "导出油站订单")
public ResponseData exportGasOrder(@RequestParam(name = "orderNo", required = false) String orderNo,
@RequestParam(name = "storeId", required = false) Long storeId,
@RequestParam(name = "status", required = false) Integer status,
@RequestParam(name = "createTimeS", required = false) Long createTimeS,
@RequestParam(name = "createTimeE", required = false) Long createTimeE) {
try {
UserInfoModel userInfoModel = userCenter.getSessionModel(UserInfoModel.class);
if (userInfoModel == null || userInfoModel.getMerchantStore() == null) {
if (userInfoModel == null) {
log.error("HighGasController -> disabledOil() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, "");
}
Map<String, Object> param = new HashMap<>();;
param.put("storeId", userInfoModel.getMerchantStore().getId());
Map<String, Object> param = new HashMap<>();
// 用户来源 0:超级管理员 1:公司 2:商户 3:门店 4. 代理商 5.充值后台工商 6.团油代理商 7.团油业务员 8. 加油站员工
if (userInfoModel.getSecUser().getObjectType().equals(2)) {
if (storeId != null) {
param.put("storeId", storeId);
} else {
String storeIdStr = "";
List<HighMerchantStore> storeList = merchantStoreService.getStoreListByMer(userInfoModel.getMerchant().getId());
for (HighMerchantStore store : storeList) {
if (StringUtils.isBlank(storeIdStr)) {
storeIdStr += store.getId().toString();
} else {
storeIdStr += "," + store.getId().toString();
}
}
if (StringUtils.isNotBlank(storeIdStr)) {
param.put("storeId", storeIdStr);
} else {
param.put("storeId", 0);
}
}
} else if (userInfoModel.getSecUser().getObjectType().equals(3)) {
param.put("storeId", userInfoModel.getMerchantStore().getId());
} else if (userInfoModel.getSecUser().getObjectType().equals(8)) {
param.put("storeId", userInfoModel.getMerchantStore().getId());
} else {
log.error("HighGasController -> disabledOil() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, "");
}
param.put("orderNo", orderNo);
param.put("createTimeS", createTimeS);
param.put("createTimeE", createTimeE);

@ -4,9 +4,14 @@ import com.alibaba.fastjson.JSONObject;
import com.hai.common.exception.ErrorCode;
import com.hai.common.exception.ErrorHelp;
import com.hai.common.exception.SysCode;
import com.hai.common.pay.util.XmlUtil;
import com.hai.common.pay.util.sdk.WXPayConstants;
import com.hai.common.utils.HttpsUtils;
import com.hai.common.utils.ResponseMsgUtil;
import com.hai.common.utils.WxUtils;
import com.hai.entity.HighMerchantTripartitePlatform;
import com.hai.model.ResponseData;
import com.hai.model.WxSharingReceiversVO;
import com.hai.service.HighMerchantTripartitePlatformService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -18,6 +23,9 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
import java.util.SortedMap;
@Controller
@RequestMapping(value = "/merchantTripartitePlatform")
@ -45,14 +53,17 @@ public class HighMerchantTripartitePlatformController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
if (body.getBoolean("profitSharingStatus") == true && body.getBigDecimal("profitSharingRatio") == null) {
if (body.getBoolean("profitSharingStatus") == true &&
(body.getBigDecimal("profitSharingRatio") == null ||
StringUtils.isBlank(body.getString("profitSharingReceiversNumber")) ||
StringUtils.isBlank(body.getString("profitSharingReceiversName")))) {
log.error("HighMerchantController -> insertMerchantStore() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
HighMerchantTripartitePlatform platform = tripartitePlatformService.getDetail(body.getLong("merId"), body.getInteger("platformType"));
if (platform == null) {
platform = new HighMerchantTripartitePlatform();
}
platform.setMerId(body.getLong("merId"));
platform.setPlatformType(body.getInteger("platformType"));
@ -60,6 +71,33 @@ public class HighMerchantTripartitePlatformController {
platform.setPlatformMerNumber(body.getString("platformMerNumber"));
platform.setProfitSharingStatus(body.getBoolean("profitSharingStatus"));
platform.setProfitSharingRatio(body.getBigDecimal("profitSharingRatio"));
platform.setProfitSharingReceiversNumber(body.getString("profitSharingReceiversNumber"));
platform.setProfitSharingReceiversName(body.getString("profitSharingReceiversName"));
// 微信平台 增加分账关系
if (platform.getPlatformType().equals(1) && platform.getProfitSharingStatus().equals(true)) {
WxSharingReceiversVO receiversVO = new WxSharingReceiversVO();
receiversVO.setAccount(platform.getProfitSharingReceiversNumber());
receiversVO.setType("MERCHANT_ID");
receiversVO.setName(platform.getProfitSharingReceiversName());
receiversVO.setRelation_type("SERVICE_PROVIDER");
Map<String , String> map = new HashMap<>();
map.put("mch_id" , "1289663601"); // 服务商
map.put("sub_mch_id" , platform.getPlatformMerNumber());
map.put("appid" , "wxa075e8509802f826");
map.put("nonce_str" , WxUtils.makeNonStr());
map.put("sign_type" , "HMAC-SHA256");
map.put("receiver" , JSONObject.toJSONString(receiversVO));
String sign = WxUtils.generateSignature(map, "Skufk5oi85wDFGl888i6wsRSTkdd5df5" , WXPayConstants.SignType.HMACSHA256);
map.put("sign" , sign);
String notifyXml = HttpsUtils.postData("https://api.mch.weixin.qq.com/pay/profitsharingaddreceiver", WxUtils.mapToXml(map));
SortedMap<String, String> postData = XmlUtil.parseXmlToTreeMap(notifyXml, "UTF-8");
if (!postData.get("result_code").equals("SUCCESS")) {
log.error("HighMerchantController -> editTripartitePlatform() error!", postData.get("err_code_des"));
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, postData.get("err_code_des"));
}
}
tripartitePlatformService.editDate(platform);
return ResponseMsgUtil.success("操作成功");

@ -72,6 +72,31 @@ public class HighOrderController {
private HighTySalesmanService highTySalesmanService;
@RequestMapping(value = "/print", method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "打印")
public ResponseData print(@RequestParam(name = "orderId", required = true) Long orderId) {
try {
HighOrder order = highOrderService.getOrderById(orderId);
if (order == null) {
log.error("HighCouponController -> getCouponList() error!","权限不足");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, "");
}
order.setPrintStatus(true);
order.setPrintNum(order.getPrintNum() + 1);
highOrderService.updateOrderDetail(order);
return ResponseMsgUtil.success("操作成功");
} catch (Exception e) {
log.error("HighOrderController --> print() error!", e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value = "/getOrderById", method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "根据id查询订单详情")
@ -321,6 +346,9 @@ public class HighOrderController {
} else if (userInfoModel.getSecUser().getObjectType() == 2) {
map.put("merchantId", userInfoModel.getMerchant().getId());
} else {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, "");
}
map.put("orderNo", orderNo);

File diff suppressed because one or more lines are too long

@ -431,6 +431,8 @@ public class HighOrderController {
highOrder.setMemPhone(userInfoModel.getHighUser().getPhone());
highOrder.setCreateTime(new Date());
highOrder.setOrderStatus(1);
highOrder.setPrintStatus(false);
highOrder.setPrintNum(0);
highOrderService.insertOrder(highOrder);

File diff suppressed because one or more lines are too long

@ -214,7 +214,7 @@ public class OrderController {
weChatPayReqInfo.setSub_mch_id(SysConst.getSysConfig().getWxGzSubMchId());//商户号
} else if (order.getHighChildOrderList().get(0).getGoodsType() == 3) {
weChatPayReqInfo.setSub_mch_id("1624126902"); // 浩联商户号
weChatPayReqInfo.setSub_mch_id("1609882817"); // 浩联商户号
profitSharing = "Y";
// 查询油站
@ -225,12 +225,11 @@ public class OrderController {
profitSharing = "N";
// 第三方平台
HighMerchantTripartitePlatform merTripartitePlatform = tripartitePlatformService.getDetail(store.getId(), 1);
HighMerchantTripartitePlatform merTripartitePlatform = tripartitePlatformService.getDetail(store.getMerchantId(), 1);
if (merTripartitePlatform != null) {
weChatPayReqInfo.setSub_mch_id(merTripartitePlatform.getPlatformMerNumber());
if (merTripartitePlatform.getProfitSharingRatio().compareTo(new BigDecimal("0")) == 1) {
profitSharing = merTripartitePlatform.getProfitSharingStatus().equals(true)?"Y":"N";
}
// 是否分账
profitSharing = merTripartitePlatform.getProfitSharingStatus().equals(true)?"Y":"N";
}
}
if (store.getPrestoreType().equals(1)) {

@ -9,18 +9,18 @@ import com.hai.common.exception.SysCode;
import com.hai.common.utils.DateUtil;
import com.hai.common.utils.IDGenerator;
import com.hai.common.utils.ResponseMsgUtil;
import com.hai.config.CommonSysConst;
import com.hai.config.HuiLianTongConfig;
import com.hai.config.TuanYouConfig;
import com.hai.config.UnionStagingPayConfig;
import com.hai.config.*;
import com.hai.dao.HighCouponCodeOtherMapper;
import com.hai.dao.HighGasOrderPushMapper;
import com.hai.dao.HighPayRecordMapper;
import com.hai.dao.HighUserCouponMapper;
import com.hai.entity.*;
import com.hai.enum_type.MerStoreAmountSourceTypeEnum;
import com.hai.enum_type.MerStoreAmountTypeEnum;
import com.hai.enum_type.OrderPushType;
import com.hai.model.HighMerchantStoreModel;
import com.hai.model.ResponseData;
import com.hai.msg.entity.MsgTopic;
import com.hai.service.*;
import com.hai.service.pay.NotifyService;
import io.swagger.annotations.Api;
@ -29,6 +29,7 @@ import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@ -47,6 +48,9 @@ public class UnionPayController {
private static Logger log = LoggerFactory.getLogger(UnionPayController.class);
@Resource
private RedisTemplate redisTemplate;
@Resource
private HighOrderService highOrderService;
@ -280,39 +284,95 @@ public class UnionPayController {
if (highChildOrder.getGoodsType() == 3) {
highChildOrder.setChildOrdeStatus(3);
order.setOrderStatus(3);
HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(highChildOrder.getGoodsId());
// 推送团油订单
Map<String,Object> paramMap = new HashMap<>();
paramMap.put("gasId", store.getStoreKey());
paramMap.put("oilNo", highChildOrder.getGasOilNo());
paramMap.put("gunNo", highChildOrder.getGasGunNo());
BigDecimal priceGun = highChildOrder.getGasPriceGun();
BigDecimal priceVip = highChildOrder.getGasPriceVip();
paramMap.put("priceGun", priceGun); // 枪单价
paramMap.put("priceVip", priceVip); // 优惠价
paramMap.put("driverPhone", order.getMemPhone());
paramMap.put("thirdSerialNo", order.getOrderNo());
paramMap.put("refuelingAmount", highChildOrder.getTotalPrice());
// 油品类型 1:汽油:2:柴油;3:天然气
if (highChildOrder.getGasOilType() == 1) {
paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouGasolineAccount());
} else if (highChildOrder.getGasOilType() == 2) {
paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouDieselAccount());
}
JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(paramMap);
// 推送团油订单记录
HighGasOrderPush highGasOrderPush = new HighGasOrderPush();
highGasOrderPush.setType(OrderPushType.type1.getType());
highGasOrderPush.setOrderNo(order.getOrderNo());
highGasOrderPush.setCreateTime(new Date());
highGasOrderPush.setCode(orderPushObject.getString("code"));
highGasOrderPush.setRequestContent(JSONObject.toJSONString(paramMap));
highGasOrderPush.setReturnContent(orderPushObject.toJSONString());
highGasOrderPushMapper.insert(highGasOrderPush);
if (orderPushObject != null && orderPushObject.getString("code").equals("200")) {
highChildOrder.setGasOrderNo(orderPushObject.getJSONObject("result").getString("orderNo"));
// 来源类型 1:平台自建 2:团油
if (store.getSourceType().equals(1)) {
// 预存类型 0:非预存 1:预存门店
if (store.getPrestoreType() != null && store.getPrestoreType().equals(1)) {
Map<String, Object> pushParam = new HashMap<>();
pushParam.put("businessType", MerStoreAmountTypeEnum.type2.getType());
pushParam.put("storeId", highChildOrder.getGoodsId());
pushParam.put("price", order.getTotalPrice());
pushParam.put("sourceType", MerStoreAmountSourceTypeEnum.type2.getType());
pushParam.put("sourceId", order.getId());
pushParam.put("sourceContent", "订单号:" + order.getOrderNo() + ",加油金额:¥" + order.getTotalPrice());
pushParam.put("opUserId", order.getMemId());
pushParam.put("opUserName", order.getMemName());
// 扣预存款
this.redisTemplate.boundListOps(MsgTopic.MerStoreAccount.getName()).leftPush(pushParam);
}
if (StringUtils.isNotBlank(store.getDeviceSn())) {
new Thread(() -> {
try {
SpPrinterConfig sp = new SpPrinterConfig();
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilCashierStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
Thread.sleep(6000);
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilClientStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
} catch (Exception e) {
e.printStackTrace();
}
}).start();
}
} else if (store.getSourceType().equals(2)) {
// 推送团油订单
Map<String,Object> paramMap = new HashMap<>();
paramMap.put("gasId", store.getStoreKey());
paramMap.put("oilNo", highChildOrder.getGasOilNo());
paramMap.put("gunNo", highChildOrder.getGasGunNo());
BigDecimal priceGun = highChildOrder.getGasPriceGun();
BigDecimal priceVip = highChildOrder.getGasPriceVip();
paramMap.put("priceGun", priceGun); // 枪单价
paramMap.put("priceVip", priceVip); // 优惠价
paramMap.put("driverPhone", order.getMemPhone());
paramMap.put("thirdSerialNo", order.getOrderNo());
paramMap.put("refuelingAmount", highChildOrder.getTotalPrice());
// 油品类型 1:汽油:2:柴油;3:天然气
if (highChildOrder.getGasOilType() == 1) {
paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouGasolineAccount());
} else if (highChildOrder.getGasOilType() == 2) {
paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouDieselAccount());
}
JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(paramMap);
// 推送团油订单记录
HighGasOrderPush highGasOrderPush = new HighGasOrderPush();
highGasOrderPush.setType(OrderPushType.type1.getType());
highGasOrderPush.setOrderNo(order.getOrderNo());
highGasOrderPush.setCreateTime(new Date());
highGasOrderPush.setCode(orderPushObject.getString("code"));
highGasOrderPush.setRequestContent(JSONObject.toJSONString(paramMap));
highGasOrderPush.setReturnContent(orderPushObject.toJSONString());
highGasOrderPushMapper.insert(highGasOrderPush);
if (orderPushObject != null && orderPushObject.getString("code").equals("200")) {
highChildOrder.setGasOrderNo(orderPushObject.getJSONObject("result").getString("orderNo"));
}
}
}

@ -39,6 +39,21 @@ spring:
max-wait: -1
max-idle: 10
min-idle: 0
#MQTT配置信息
mqtt:
#MQTT服务地址
url: ws://139.159.177.244:8083/mqtt
#用户名
username: printer_provider
#密码
password: 123654
#客户端id(不能重复)
# client:
# id: provider-id
#MQTT默认的消息推送主题,实际可在调用接口是指定
# default:
# topic: topic
#配置日期返回至前台为时间戳
jackson:
serialization:

@ -264,6 +264,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mqtt</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>

@ -709,7 +709,7 @@ public class HttpsUtils {
* @Param [url, str]
* @return com.alibaba.fastjson.JSONObject
**/
public static JSONObject postData(String url, String str) {
public static String postData(String url, String str) {
CloseableHttpClient httpClient = null;
if (url.startsWith("https")) {
httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
@ -731,7 +731,7 @@ public class HttpsUtils {
response = httpClient.execute(httpPost);
HttpEntity entity = response.getEntity();
httpStr = EntityUtils.toString(entity, "UTF-8");
return JSON.parseObject(httpStr);
return httpStr;
} catch (Exception e) {
log.error(e.getMessage(),e);
} finally {

@ -0,0 +1,39 @@
package com.hai.config;
import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
import org.eclipse.paho.client.mqttv3.MqttCallback;
import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.springframework.context.annotation.Configuration;
@Configuration
public class MqttProviderCallBack implements MqttCallback {
/**
* 与服务器断开
* @param throwable
*/
@Override
public void connectionLost(Throwable throwable) {
}
/**
* 消息到达回调
* @param s
* @param mqttMessage
* @throws Exception
*/
@Override
public void messageArrived(String s, MqttMessage mqttMessage) throws Exception {
System.out.println("消息到达");
}
/**
* 消息发布成功回调
* @param iMqttDeliveryToken
*/
@Override
public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
System.out.println("消息发布");
}
}

@ -0,0 +1,208 @@
package com.hai.config;
import io.netty.handler.codec.mqtt.MqttConnAckVariableHeader;
import io.netty.handler.codec.mqtt.MqttConnectVariableHeader;
import io.netty.handler.codec.mqtt.MqttMessageIdVariableHeader;
import io.netty.handler.codec.mqtt.MqttPublishVariableHeader;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.PostConstruct;
import org.eclipse.paho.client.mqttv3.*;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
@Configuration
@Slf4j
public class MqttProviderConfig {
// @Value("${spring.mqtt.username}")
private String username;
// @Value("${spring.mqtt.password}")
private String password;
// @Value("${spring.mqtt.url}")
private String hostUrl;
/* @Value("${spring.mqtt.client.id}")
private String clientId;
@Value("${spring.mqtt.default.topic}")
private String defaultTopic;*/
/**
* 客户端对象
*/
private MqttClient client;
/**
* 在bean初始化后连接到服务器
*/
// @PostConstruct
public void init() {
connect("provider-" + System.currentTimeMillis());
}
/*
@PostConstruct
public void init(String clientId) {
connect(clientId);
}*/
/**
* 客户端连接服务端
*/
public void connect(String clientId){
try{
//创建MQTT客户端对象
client = new MqttClient(hostUrl,clientId,new MemoryPersistence());
//连接设置
MqttConnectOptions options = new MqttConnectOptions();
//是否清空session,设置false表示服务器会保留客户端的连接记录(订阅主题,qos),客户端重连之后能获取到服务器在客户端断开连接期间推送的消息
//设置为true表示每次连接服务器都是以新的身份
options.setCleanSession(true);
//设置连接用户名
options.setUserName(username);
//设置连接密码
options.setPassword(password.toCharArray());
//设置超时时间,单位为秒
options.setConnectionTimeout(100);
//设置心跳时间 单位为秒,表示服务器每隔 1.5*20秒的时间向客户端发送心跳判断客户端是否在线
options.setKeepAliveInterval(20);
// 设置遗嘱消息的话题,若客户端和服务器之间的连接意外断开,服务器将发布客户端的遗嘱信息
// options.setWill("willTopic",(clientId + "与服务器断开连接").getBytes(),0,false);
//设置回调
client.setCallback(new MqttProviderCallBack());
client.connect(options);
} catch(MqttException e){
e.printStackTrace();
}
}
public void publish(int qos,boolean retained,String topic,String message) {
if (client == null) {
init();
}
try {
MqttMessage mqttMessage = new MqttMessage();
mqttMessage.setQos(qos);
mqttMessage.setRetained(retained);
mqttMessage.setPayload(message.getBytes("UTF-8"));
// 主题的目的地,用于发布/订阅信息
MqttTopic mqttTopic = client.getTopic(topic);
//提供一种机制来跟踪消息的传递进度
//用于在以非阻塞方式(在后台运行)执行发布是跟踪消息的传递进度
MqttDeliveryToken token;
//将指定消息发布到主题,但不等待消息传递完成,返回的token可用于跟踪消息的传递状态
//一旦此方法干净地返回,消息就已被客户端接受发布,当连接可用,将在后台完成消息传递。
token = mqttTopic.publish(mqttMessage);
token.waitForCompletion();
} catch (MqttException e) {
e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
}
}
public static void main(String[] args) {
System.out.println(sendPrinterRrCodeBytest("1213131", 1));
}
public static byte[] sendPrinterRrCodeBytest(String printText, int pageCount) {
try {
byte[] by = printText.getBytes();
byte[] msgByte = new byte[by.length + 16];
// 写入缓存
msgByte[0] = 29;
msgByte[1] = 40;
msgByte[2] = 107;
msgByte[3] = (byte)(by.length+3);
msgByte[4] = 0;
msgByte[5] = 49;
msgByte[6] = 80;
msgByte[7] = 48; // (byte)0x30);
int index = 7;
for (int i = 0; i < by.length; i++)
{
index = index+1;
msgByte[index] = by[i];
}
// 打印缓存中的数据
msgByte[index + 1] = 29;
msgByte[index + 2] = 40;
msgByte[index + 3] = 107;
msgByte[index + 4] = (byte)(by.length+3);
msgByte[index + 5] = 0;
msgByte[index + 6] = 49;
msgByte[index + 7] = 81;
msgByte[index + 8] = 48; // (byte)0x30);
byte[] array = new byte[msgByte.length + 9];
array[0] = 30;
array[1] = 16;
array[2] =(byte) pageCount;//打印份数
int num = array.length - 5;
array[3] = (byte)(num >> 8);
//array[4] = (byte)((uint)num & 0xFFu);
array[4] = (byte)(num & 0xFF);
for (int i = 0; i < msgByte.length; i++)
{
array[i+ 5] = msgByte[i];
}
array[array.length - 4] = 27;
array[array.length - 3] = 99;
byte[] crc16CodeArray = getCRC(msgByte);
array[array.length - 2] = crc16CodeArray[0];
array[array.length - 1] = crc16CodeArray[1];
return array;
} catch (Exception ex) {
System.out.println(ex.getStackTrace());
}
return null;
}
private static byte[] getCRC(byte[] bytes) {
int crc = 0xFFFF; // 初始值
for (byte b : bytes) {
crc = (crc >> 8) ^ CRC16Table[(crc ^ b) & 0xff];
}
byte[] b = new byte[2];
b[0] = (byte) ((crc >> 8)^0xff);
b[1] = (byte) ((crc & 0xff)^0xff);
return b;
}
private static int[] CRC16Table = { 0x0000, 0x1189, 0x2312, 0x329b, 0x4624,
0x57ad, 0x6536, 0x74bf, 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c,
0xdbe5, 0xe97e, 0xf8f7, 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5,
0x472c, 0x75b7, 0x643e, 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed,
0xcb64, 0xf9ff, 0xe876, 0x2102, 0x308b, 0x0210, 0x1399, 0x6726,
0x76af, 0x4434, 0x55bd, 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e,
0xfae7, 0xc87c, 0xd9f5, 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7,
0x662e, 0x54b5, 0x453c, 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef,
0xea66, 0xd8fd, 0xc974, 0x4204, 0x538d, 0x6116, 0x709f, 0x0420,
0x15a9, 0x2732, 0x36bb, 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868,
0x99e1, 0xab7a, 0xbaf3, 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1,
0x0528, 0x37b3, 0x263a, 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9,
0x8960, 0xbbfb, 0xaa72, 0x6306, 0x728f, 0x4014, 0x519d, 0x2522,
0x34ab, 0x0630, 0x17b9, 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a,
0xb8e3, 0x8a78, 0x9bf1, 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3,
0x242a, 0x16b1, 0x0738, 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb,
0xa862, 0x9af9, 0x8b70, 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c,
0xd3a5, 0xe13e, 0xf0b7, 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64,
0x5fed, 0x6d76, 0x7cff, 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad,
0xc324, 0xf1bf, 0xe036, 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5,
0x4f6c, 0x7df7, 0x6c7e, 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e,
0xf2a7, 0xc03c, 0xd1b5, 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66,
0x7eef, 0x4c74, 0x5dfd, 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af,
0xe226, 0xd0bd, 0xc134, 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7,
0x6e6e, 0x5cf5, 0x4d7c, 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028,
0x91a1, 0xa33a, 0xb2b3, 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60,
0x1de9, 0x2f72, 0x3efb, 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9,
0x8120, 0xb3bb, 0xa232, 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1,
0x0d68, 0x3ff3, 0x2e7a, 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a,
0xb0a3, 0x8238, 0x93b1, 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62,
0x3ceb, 0x0e70, 0x1ff9, 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab,
0xa022, 0x92b9, 0x8330, 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3,
0x2c6a, 0x1ef1, 0x0f78 };
}

@ -0,0 +1,219 @@
package com.hai.config;
import org.junit.Test;
import java.io.UnsupportedEncodingException;
public class PrintDemo {
private String accessKeyId = "LTAI5tHHL3z6gpJbMmCg3zt2";
private String accessKeySecret = "CC9kAuqgdjKiE6jxSQHddFxGDCTpBQ";
private String instanceId = "post-cn-i7m2558ze01";
private String topic = "Box";
private String groupId= "GID_BOX";
private String endpoint= "onsmqtt.mq-internet-access.aliyuncs.com";
public static final int PAYTYPE_VOICE_NULL=2000;
public static final int PAYTYPE_VOICE_ALI=2001;
public static final int PAYTYPE_VOICE_QQ=2002;
public static final int PAYTYPE_VOICE_WECHAT=2003;
public static final int PAYTYPE_VOICE_JD=2004;
public static final int PAYTYPE_VOICE_UNION=2005;
public static final int PAYTYPE_VOICE_DIY7570=7570;
public static final int PAYTYPE_VOICE_DIY7571=7571;
public static final int PAYTYPE_VOICE_DIY7572=7572;
public static final int PAYTYPE_VOICE_DIY7573=7573;
public static final int PAYTYPE_VOICE_DIY7574=7574;
public static final int PAYTYPE_VOICE_DIY7575=7575;
public static final int PAYTYPE_VOICE_DIY7576=7576;
public static final int PAYTYPE_VOICE_DIY7577=7577;
public static final int PAYTYPE_VOICE_DIY7578=7578;
public static final int PAYTYPE_VOICE_DIY7579=7579;
@Test
public void Test(){
String imeiStr="352736082440754";//设备IMEI
String printText="1234\r\n";//打印文本
String voiceMsgId="2019022611153312312345";//消息ID
String voiceMsgMoney="1234";//播报金额
//获取打印内容
byte[] printData = getPrinterBytes(printText, 1, "");
System.out.println(bytes2Hex(printData));
//获取播报字符串
System.out.println(getStaticVoiceStr(imeiStr,voiceMsgId,voiceMsgMoney,PAYTYPE_VOICE_ALI));
//获取播报打印机指令
printData=getPrinterVoiceBytes(printText,1,"",imeiStr,voiceMsgId,voiceMsgMoney,PAYTYPE_VOICE_ALI);
System.out.println(bytes2Hex(printData));
/*
try {
com.aliyun.onsmqtt20200420.Client client = createClient(accessKeyId, accessKeySecret);
SendMessageRequest sendMessageRequest = new SendMessageRequest()
.setInstanceId("post-cn-i7m2558ze01")
.setMqttTopic("Box/p2p/GID_BOX@@@359ac67b25c11b8")
.setPayload(bytes2Hex(printData));
SendMessageResponse sendMessageResponse = client.sendMessage(sendMessageRequest);
System.out.println(sendMessageResponse.getBody().msgId);
} catch (Exception e) {
e.printStackTrace();
}*/
}
/**
* 使用AK&SK初始化账号Client
* @param accessKeyId
* @param accessKeySecret
* @return Client
* @throws Exception
*/
/* public com.aliyun.onsmqtt20200420.Client createClient(String accessKeyId, String accessKeySecret) throws Exception {
Config config = new Config()
// 您的AccessKey ID
.setAccessKeyId(accessKeyId)
// 您的AccessKey Secret
.setAccessKeySecret(accessKeySecret);
// 访问的域名
config.endpoint = endpoint;
return new com.aliyun.onsmqtt20200420.Client(config);
}*/
/**
* 支付播报固定语音字节数组
* @param imeiStr IMEI设备唯一标识
* @param msgId 交易序列号不大于32字节保证唯一
* @param moneyStr 播报金额最多两位小数
* @param payType 支付类型
* @return
*/
public static byte[] getStaticVoiceBytes(String imeiStr,String msgId,String moneyStr,int payType){
return getStaticVoiceStr(imeiStr,msgId,moneyStr,payType).getBytes();
}
/**
* 支付播报固定语音字符串
* @param imeiStr IMEI设备唯一标识
* @param msgId 交易序列号不大于32字节保证唯一
* @param moneyStr 播报金额最多两位小数
* @param payType 支付类型
* @return
*/
public static String getStaticVoiceStr(String imeiStr,String msgId,String moneyStr,int payType){
String str=imeiStr+"|1007|"+msgId+"|"+moneyStr+"|"+payType;
return str;
}
/**
* 获取打印内容适用于云打印机
* @param printText 打印文本
* @param pageCount 打印联数
* @param encodingStr 编码方式默认UTF-8
* @return
*/
public static byte[] getPrinterBytes(final String printText,
final int pageCount, String encodingStr) {
try {
if(encodingStr.equals("")){
encodingStr="UTF-8";
}
byte[] msgByte = printText.getBytes(encodingStr);
// 消息数组
final byte[] dataByte = new byte[msgByte.length + 9];
dataByte[0] = 0x1E;
dataByte[1] = 0x10;
dataByte[2] = (byte) pageCount;// 打印多联
// 有效数据长度
final int len = dataByte.length - 5;
dataByte[3] = (byte) (len >> 8);
dataByte[4] = (byte) (len & 0xff);
// 数据内容
System.arraycopy(msgByte, 0, dataByte, 5, msgByte.length);
// 标识字节
dataByte[dataByte.length - 4] = 0x1b;
dataByte[dataByte.length - 3] = 0x63;
// 打印内容CRC校验
final byte[] dtCRC = getCRC(msgByte);
dataByte[dataByte.length - 2] = (byte) (dtCRC[0]);
dataByte[dataByte.length - 1] = (byte) (dtCRC[1]);
msgByte = dataByte;
return msgByte;
} catch (Exception ex) {
System.out.println(ex.getStackTrace());
}
return null;
}
public static byte[] getPrinterVoiceBytes(String printTxt,int pageCount,String encodingStr,String imeiStr,String msgId,String moneyStr,int payType){
byte[] voiceArray=getStaticVoiceBytes(imeiStr, msgId, moneyStr, payType);
byte[] printerArray=getPrinterBytes(printTxt,pageCount,encodingStr);
byte[] data=new byte[voiceArray.length+printerArray.length];
System.arraycopy(printerArray, 0, data, 0, printerArray.length);
System.arraycopy(voiceArray, 0, data, printerArray.length, voiceArray.length);
return data;
}
private static int[] CRC16Table = { 0x0000, 0x1189, 0x2312, 0x329b, 0x4624,
0x57ad, 0x6536, 0x74bf, 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c,
0xdbe5, 0xe97e, 0xf8f7, 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5,
0x472c, 0x75b7, 0x643e, 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed,
0xcb64, 0xf9ff, 0xe876, 0x2102, 0x308b, 0x0210, 0x1399, 0x6726,
0x76af, 0x4434, 0x55bd, 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e,
0xfae7, 0xc87c, 0xd9f5, 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7,
0x662e, 0x54b5, 0x453c, 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef,
0xea66, 0xd8fd, 0xc974, 0x4204, 0x538d, 0x6116, 0x709f, 0x0420,
0x15a9, 0x2732, 0x36bb, 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868,
0x99e1, 0xab7a, 0xbaf3, 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1,
0x0528, 0x37b3, 0x263a, 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9,
0x8960, 0xbbfb, 0xaa72, 0x6306, 0x728f, 0x4014, 0x519d, 0x2522,
0x34ab, 0x0630, 0x17b9, 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a,
0xb8e3, 0x8a78, 0x9bf1, 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3,
0x242a, 0x16b1, 0x0738, 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb,
0xa862, 0x9af9, 0x8b70, 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c,
0xd3a5, 0xe13e, 0xf0b7, 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64,
0x5fed, 0x6d76, 0x7cff, 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad,
0xc324, 0xf1bf, 0xe036, 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5,
0x4f6c, 0x7df7, 0x6c7e, 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e,
0xf2a7, 0xc03c, 0xd1b5, 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66,
0x7eef, 0x4c74, 0x5dfd, 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af,
0xe226, 0xd0bd, 0xc134, 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7,
0x6e6e, 0x5cf5, 0x4d7c, 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028,
0x91a1, 0xa33a, 0xb2b3, 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60,
0x1de9, 0x2f72, 0x3efb, 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9,
0x8120, 0xb3bb, 0xa232, 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1,
0x0d68, 0x3ff3, 0x2e7a, 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a,
0xb0a3, 0x8238, 0x93b1, 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62,
0x3ceb, 0x0e70, 0x1ff9, 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab,
0xa022, 0x92b9, 0x8330, 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3,
0x2c6a, 0x1ef1, 0x0f78 };
private static byte[] getCRC(byte[] bytes) {
int crc = 0xFFFF; // 初始值
for (byte b : bytes) {
crc = (crc >> 8) ^ CRC16Table[(crc ^ b) & 0xff];
}
byte[] b = new byte[2];
b[0] = (byte) ((crc >> 8)^0xff);
b[1] = (byte) ((crc & 0xff)^0xff);
return b;
}
private static final char[] HEXES = { '0', '1', '2', '3', '4', '5', '6',
'7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
/**
* byte数组 转换成 16进制小写字符串
*/
private static String bytes2Hex(byte[] bytes) {
if (bytes == null || bytes.length == 0) {
return null;
}
StringBuilder hex = new StringBuilder();
for (byte b : bytes) {
hex.append(HEXES[(b >> 4) & 0x0F]);
hex.append(HEXES[b & 0x0F]);
}
return hex.toString();
}
}

@ -123,14 +123,14 @@ public class TuanYouConfig {
* @return 请求结果
* @throws Exception
*/
public static JSONObject queryThirdOrderDretail(String thirdSerialNo) throws Exception {
public static JSONObject queryThirdOrderDetail(String thirdSerialNo) throws Exception {
Map<String,Object> paramMap = new HashMap<>();
paramMap.put("app_key", CommonSysConst.getSysConfig().getTuanYouAppKey());
paramMap.put("timestamp", new Date().getTime());
paramMap.put("companyCode", "new Date().getTime()");
paramMap.put("companyCode", CommonSysConst.getSysConfig().getTuanYouAppKey());
paramMap.put("thirdSerialNo", thirdSerialNo);
paramMap.put("sign", MD5Util.encode(generateTuanYouSignature(paramMap,CommonSysConst.getSysConfig().getTuanYouAppSecret()).getBytes()).toLowerCase());
return HttpsUtils.doPost(CommonSysConst.getSysConfig().getTuanYouUrl()+"/services/vp/openapi/queryCompanyAccountInfo2JD", JSON.toJSONString(paramMap));
return HttpsUtils.doPost(CommonSysConst.getSysConfig().getTuanYouUrl()+"/services/vp/openapi/queryThirdOrderDetail", JSON.toJSONString(paramMap));
}
/**

@ -42,12 +42,14 @@ public interface HighMerchantTripartitePlatformMapper extends HighMerchantTripar
"insert into high_merchant_tripartite_platform (mer_id, platform_type, ",
"platform_mer_name, platform_mer_number, ",
"profit_sharing_status, profit_sharing_ratio, ",
"profit_sharing_receivers_number, profit_sharing_receivers_name, ",
"`status`, create_time, ",
"update_time, ext_1, ",
"ext_2, ext_3)",
"values (#{merId,jdbcType=BIGINT}, #{platformType,jdbcType=INTEGER}, ",
"#{platformMerName,jdbcType=VARCHAR}, #{platformMerNumber,jdbcType=VARCHAR}, ",
"#{profitSharingStatus,jdbcType=BIT}, #{profitSharingRatio,jdbcType=DECIMAL}, ",
"#{profitSharingReceiversNumber,jdbcType=VARCHAR}, #{profitSharingReceiversName,jdbcType=VARCHAR}, ",
"#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
@ -68,6 +70,8 @@ public interface HighMerchantTripartitePlatformMapper extends HighMerchantTripar
@Result(column="platform_mer_number", property="platformMerNumber", jdbcType=JdbcType.VARCHAR),
@Result(column="profit_sharing_status", property="profitSharingStatus", jdbcType=JdbcType.BIT),
@Result(column="profit_sharing_ratio", property="profitSharingRatio", jdbcType=JdbcType.DECIMAL),
@Result(column="profit_sharing_receivers_number", property="profitSharingReceiversNumber", jdbcType=JdbcType.VARCHAR),
@Result(column="profit_sharing_receivers_name", property="profitSharingReceiversName", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@ -80,7 +84,8 @@ public interface HighMerchantTripartitePlatformMapper extends HighMerchantTripar
@Select({
"select",
"id, mer_id, platform_type, platform_mer_name, platform_mer_number, profit_sharing_status, ",
"profit_sharing_ratio, `status`, create_time, update_time, ext_1, ext_2, ext_3",
"profit_sharing_ratio, profit_sharing_receivers_number, profit_sharing_receivers_name, ",
"`status`, create_time, update_time, ext_1, ext_2, ext_3",
"from high_merchant_tripartite_platform",
"where id = #{id,jdbcType=BIGINT}"
})
@ -92,6 +97,8 @@ public interface HighMerchantTripartitePlatformMapper extends HighMerchantTripar
@Result(column="platform_mer_number", property="platformMerNumber", jdbcType=JdbcType.VARCHAR),
@Result(column="profit_sharing_status", property="profitSharingStatus", jdbcType=JdbcType.BIT),
@Result(column="profit_sharing_ratio", property="profitSharingRatio", jdbcType=JdbcType.DECIMAL),
@Result(column="profit_sharing_receivers_number", property="profitSharingReceiversNumber", jdbcType=JdbcType.VARCHAR),
@Result(column="profit_sharing_receivers_name", property="profitSharingReceiversName", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@ -118,6 +125,8 @@ public interface HighMerchantTripartitePlatformMapper extends HighMerchantTripar
"platform_mer_number = #{platformMerNumber,jdbcType=VARCHAR},",
"profit_sharing_status = #{profitSharingStatus,jdbcType=BIT},",
"profit_sharing_ratio = #{profitSharingRatio,jdbcType=DECIMAL},",
"profit_sharing_receivers_number = #{profitSharingReceiversNumber,jdbcType=VARCHAR},",
"profit_sharing_receivers_name = #{profitSharingReceiversName,jdbcType=VARCHAR},",
"`status` = #{status,jdbcType=INTEGER},",
"create_time = #{createTime,jdbcType=TIMESTAMP},",
"update_time = #{updateTime,jdbcType=TIMESTAMP},",

@ -52,6 +52,14 @@ public class HighMerchantTripartitePlatformSqlProvider {
sql.VALUES("profit_sharing_ratio", "#{profitSharingRatio,jdbcType=DECIMAL}");
}
if (record.getProfitSharingReceiversNumber() != null) {
sql.VALUES("profit_sharing_receivers_number", "#{profitSharingReceiversNumber,jdbcType=VARCHAR}");
}
if (record.getProfitSharingReceiversName() != null) {
sql.VALUES("profit_sharing_receivers_name", "#{profitSharingReceiversName,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
}
@ -92,6 +100,8 @@ public class HighMerchantTripartitePlatformSqlProvider {
sql.SELECT("platform_mer_number");
sql.SELECT("profit_sharing_status");
sql.SELECT("profit_sharing_ratio");
sql.SELECT("profit_sharing_receivers_number");
sql.SELECT("profit_sharing_receivers_name");
sql.SELECT("`status`");
sql.SELECT("create_time");
sql.SELECT("update_time");
@ -143,6 +153,14 @@ public class HighMerchantTripartitePlatformSqlProvider {
sql.SET("profit_sharing_ratio = #{record.profitSharingRatio,jdbcType=DECIMAL}");
}
if (record.getProfitSharingReceiversNumber() != null) {
sql.SET("profit_sharing_receivers_number = #{record.profitSharingReceiversNumber,jdbcType=VARCHAR}");
}
if (record.getProfitSharingReceiversName() != null) {
sql.SET("profit_sharing_receivers_name = #{record.profitSharingReceiversName,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
}
@ -182,6 +200,8 @@ public class HighMerchantTripartitePlatformSqlProvider {
sql.SET("platform_mer_number = #{record.platformMerNumber,jdbcType=VARCHAR}");
sql.SET("profit_sharing_status = #{record.profitSharingStatus,jdbcType=BIT}");
sql.SET("profit_sharing_ratio = #{record.profitSharingRatio,jdbcType=DECIMAL}");
sql.SET("profit_sharing_receivers_number = #{record.profitSharingReceiversNumber,jdbcType=VARCHAR}");
sql.SET("profit_sharing_receivers_name = #{record.profitSharingReceiversName,jdbcType=VARCHAR}");
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
@ -222,6 +242,14 @@ public class HighMerchantTripartitePlatformSqlProvider {
sql.SET("profit_sharing_ratio = #{profitSharingRatio,jdbcType=DECIMAL}");
}
if (record.getProfitSharingReceiversNumber() != null) {
sql.SET("profit_sharing_receivers_number = #{profitSharingReceiversNumber,jdbcType=VARCHAR}");
}
if (record.getProfitSharingReceiversName() != null) {
sql.SET("profit_sharing_receivers_name = #{profitSharingReceiversName,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{status,jdbcType=INTEGER}");
}

@ -55,6 +55,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"refund_content, refusal_refund_content, ",
"Identification_code, profit_sharing_status, ",
"profit_sharing_ratio, account_merchant_num, ",
"print_status, print_num, ",
"ext_1, ext_2, ext_3)",
"values (#{orderNo,jdbcType=VARCHAR}, #{memDiscountId,jdbcType=BIGINT}, ",
"#{memDiscountName,jdbcType=VARCHAR}, #{memId,jdbcType=BIGINT}, ",
@ -72,6 +73,7 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"#{refundContent,jdbcType=VARCHAR}, #{refusalRefundContent,jdbcType=VARCHAR}, ",
"#{identificationCode,jdbcType=BIGINT}, #{profitSharingStatus,jdbcType=BIT}, ",
"#{profitSharingRatio,jdbcType=DECIMAL}, #{accountMerchantNum,jdbcType=VARCHAR}, ",
"#{printStatus,jdbcType=BIT}, #{printNum,jdbcType=INTEGER}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
@ -116,6 +118,8 @@ public interface HighOrderMapper extends HighOrderMapperExt {
@Result(column="profit_sharing_status", property="profitSharingStatus", jdbcType=JdbcType.BIT),
@Result(column="profit_sharing_ratio", property="profitSharingRatio", jdbcType=JdbcType.DECIMAL),
@Result(column="account_merchant_num", property="accountMerchantNum", jdbcType=JdbcType.VARCHAR),
@Result(column="print_status", property="printStatus", jdbcType=JdbcType.BIT),
@Result(column="print_num", property="printNum", jdbcType=JdbcType.INTEGER),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
@ -129,7 +133,8 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"pay_real_price, pay_serial_no, deduction_price, order_status, total_price, create_time, ",
"pay_time, cancel_time, cancel_remarks, finish_time, remarks, refund_time, refund_price, ",
"refund_content, refusal_refund_content, Identification_code, profit_sharing_status, ",
"profit_sharing_ratio, account_merchant_num, ext_1, ext_2, ext_3",
"profit_sharing_ratio, account_merchant_num, print_status, print_num, ext_1, ",
"ext_2, ext_3",
"from high_order",
"where id = #{id,jdbcType=BIGINT}"
})
@ -167,6 +172,8 @@ public interface HighOrderMapper extends HighOrderMapperExt {
@Result(column="profit_sharing_status", property="profitSharingStatus", jdbcType=JdbcType.BIT),
@Result(column="profit_sharing_ratio", property="profitSharingRatio", jdbcType=JdbcType.DECIMAL),
@Result(column="account_merchant_num", property="accountMerchantNum", jdbcType=JdbcType.VARCHAR),
@Result(column="print_status", property="printStatus", jdbcType=JdbcType.BIT),
@Result(column="print_num", property="printNum", jdbcType=JdbcType.INTEGER),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
@ -216,6 +223,8 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"profit_sharing_status = #{profitSharingStatus,jdbcType=BIT},",
"profit_sharing_ratio = #{profitSharingRatio,jdbcType=DECIMAL},",
"account_merchant_num = #{accountMerchantNum,jdbcType=VARCHAR},",
"print_status = #{printStatus,jdbcType=BIT},",
"print_num = #{printNum,jdbcType=INTEGER},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",
"ext_2 = #{ext2,jdbcType=VARCHAR},",
"ext_3 = #{ext3,jdbcType=VARCHAR}",

@ -1115,11 +1115,13 @@ public interface HighOrderMapperExt {
" b.pay_time payTime," +
" b.refund_time refundTime," +
" b.refund_price refundPrice," +
" b.refund_content refundContent" +
" b.refund_content refundContent," +
" b.print_status printStatus," +
" b.print_num printNum" +
" from high_child_order a,high_order b " +
" where a.order_id = b.id " +
" and goods_type = 3 " +
"<if test='param.storeId != null'> and goods_id = #{param.storeId} </if>" +
"<if test='param.storeId != null'> and goods_id in (${param.storeId}) </if>" +
"<if test='param.status != null'> and b.order_status in (${param.status})</if>" +
"<if test='param.createTimeS != null'> <![CDATA[ and b.create_time >= #{param.createTimeS} ]]> </if>",
"<if test='param.createTimeE != null'> <![CDATA[ and b.create_time <= #{param.createTimeE} ]]> </if>",

@ -156,6 +156,14 @@ public class HighOrderSqlProvider {
sql.VALUES("account_merchant_num", "#{accountMerchantNum,jdbcType=VARCHAR}");
}
if (record.getPrintStatus() != null) {
sql.VALUES("print_status", "#{printStatus,jdbcType=BIT}");
}
if (record.getPrintNum() != null) {
sql.VALUES("print_num", "#{printNum,jdbcType=INTEGER}");
}
if (record.getExt1() != null) {
sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
}
@ -210,6 +218,8 @@ public class HighOrderSqlProvider {
sql.SELECT("profit_sharing_status");
sql.SELECT("profit_sharing_ratio");
sql.SELECT("account_merchant_num");
sql.SELECT("print_status");
sql.SELECT("print_num");
sql.SELECT("ext_1");
sql.SELECT("ext_2");
sql.SELECT("ext_3");
@ -362,6 +372,14 @@ public class HighOrderSqlProvider {
sql.SET("account_merchant_num = #{record.accountMerchantNum,jdbcType=VARCHAR}");
}
if (record.getPrintStatus() != null) {
sql.SET("print_status = #{record.printStatus,jdbcType=BIT}");
}
if (record.getPrintNum() != null) {
sql.SET("print_num = #{record.printNum,jdbcType=INTEGER}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
}
@ -415,6 +433,8 @@ public class HighOrderSqlProvider {
sql.SET("profit_sharing_status = #{record.profitSharingStatus,jdbcType=BIT}");
sql.SET("profit_sharing_ratio = #{record.profitSharingRatio,jdbcType=DECIMAL}");
sql.SET("account_merchant_num = #{record.accountMerchantNum,jdbcType=VARCHAR}");
sql.SET("print_status = #{record.printStatus,jdbcType=BIT}");
sql.SET("print_num = #{record.printNum,jdbcType=INTEGER}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
@ -556,6 +576,14 @@ public class HighOrderSqlProvider {
sql.SET("account_merchant_num = #{accountMerchantNum,jdbcType=VARCHAR}");
}
if (record.getPrintStatus() != null) {
sql.SET("print_status = #{printStatus,jdbcType=BIT}");
}
if (record.getPrintNum() != null) {
sql.SET("print_num = #{printNum,jdbcType=INTEGER}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
}

@ -46,6 +46,16 @@ public class HighMerchantTripartitePlatform implements Serializable {
*/
private BigDecimal profitSharingRatio;
/**
* 分账接收方账户
*/
private String profitSharingReceiversNumber;
/**
* 分账接收方名称
*/
private String profitSharingReceiversName;
/**
* 状态 0删除 1正常
*/
@ -125,6 +135,22 @@ public class HighMerchantTripartitePlatform implements Serializable {
this.profitSharingRatio = profitSharingRatio;
}
public String getProfitSharingReceiversNumber() {
return profitSharingReceiversNumber;
}
public void setProfitSharingReceiversNumber(String profitSharingReceiversNumber) {
this.profitSharingReceiversNumber = profitSharingReceiversNumber;
}
public String getProfitSharingReceiversName() {
return profitSharingReceiversName;
}
public void setProfitSharingReceiversName(String profitSharingReceiversName) {
this.profitSharingReceiversName = profitSharingReceiversName;
}
public Integer getStatus() {
return status;
}
@ -192,6 +218,8 @@ public class HighMerchantTripartitePlatform implements Serializable {
&& (this.getPlatformMerNumber() == null ? other.getPlatformMerNumber() == null : this.getPlatformMerNumber().equals(other.getPlatformMerNumber()))
&& (this.getProfitSharingStatus() == null ? other.getProfitSharingStatus() == null : this.getProfitSharingStatus().equals(other.getProfitSharingStatus()))
&& (this.getProfitSharingRatio() == null ? other.getProfitSharingRatio() == null : this.getProfitSharingRatio().equals(other.getProfitSharingRatio()))
&& (this.getProfitSharingReceiversNumber() == null ? other.getProfitSharingReceiversNumber() == null : this.getProfitSharingReceiversNumber().equals(other.getProfitSharingReceiversNumber()))
&& (this.getProfitSharingReceiversName() == null ? other.getProfitSharingReceiversName() == null : this.getProfitSharingReceiversName().equals(other.getProfitSharingReceiversName()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
@ -211,6 +239,8 @@ public class HighMerchantTripartitePlatform implements Serializable {
result = prime * result + ((getPlatformMerNumber() == null) ? 0 : getPlatformMerNumber().hashCode());
result = prime * result + ((getProfitSharingStatus() == null) ? 0 : getProfitSharingStatus().hashCode());
result = prime * result + ((getProfitSharingRatio() == null) ? 0 : getProfitSharingRatio().hashCode());
result = prime * result + ((getProfitSharingReceiversNumber() == null) ? 0 : getProfitSharingReceiversNumber().hashCode());
result = prime * result + ((getProfitSharingReceiversName() == null) ? 0 : getProfitSharingReceiversName().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
@ -233,6 +263,8 @@ public class HighMerchantTripartitePlatform implements Serializable {
sb.append(", platformMerNumber=").append(platformMerNumber);
sb.append(", profitSharingStatus=").append(profitSharingStatus);
sb.append(", profitSharingRatio=").append(profitSharingRatio);
sb.append(", profitSharingReceiversNumber=").append(profitSharingReceiversNumber);
sb.append(", profitSharingReceiversName=").append(profitSharingReceiversName);
sb.append(", status=").append(status);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);

@ -566,6 +566,146 @@ public class HighMerchantTripartitePlatformExample {
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberIsNull() {
addCriterion("profit_sharing_receivers_number is null");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberIsNotNull() {
addCriterion("profit_sharing_receivers_number is not null");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberEqualTo(String value) {
addCriterion("profit_sharing_receivers_number =", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberNotEqualTo(String value) {
addCriterion("profit_sharing_receivers_number <>", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberGreaterThan(String value) {
addCriterion("profit_sharing_receivers_number >", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberGreaterThanOrEqualTo(String value) {
addCriterion("profit_sharing_receivers_number >=", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberLessThan(String value) {
addCriterion("profit_sharing_receivers_number <", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberLessThanOrEqualTo(String value) {
addCriterion("profit_sharing_receivers_number <=", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberLike(String value) {
addCriterion("profit_sharing_receivers_number like", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberNotLike(String value) {
addCriterion("profit_sharing_receivers_number not like", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberIn(List<String> values) {
addCriterion("profit_sharing_receivers_number in", values, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberNotIn(List<String> values) {
addCriterion("profit_sharing_receivers_number not in", values, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberBetween(String value1, String value2) {
addCriterion("profit_sharing_receivers_number between", value1, value2, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberNotBetween(String value1, String value2) {
addCriterion("profit_sharing_receivers_number not between", value1, value2, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameIsNull() {
addCriterion("profit_sharing_receivers_name is null");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameIsNotNull() {
addCriterion("profit_sharing_receivers_name is not null");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameEqualTo(String value) {
addCriterion("profit_sharing_receivers_name =", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameNotEqualTo(String value) {
addCriterion("profit_sharing_receivers_name <>", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameGreaterThan(String value) {
addCriterion("profit_sharing_receivers_name >", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameGreaterThanOrEqualTo(String value) {
addCriterion("profit_sharing_receivers_name >=", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameLessThan(String value) {
addCriterion("profit_sharing_receivers_name <", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameLessThanOrEqualTo(String value) {
addCriterion("profit_sharing_receivers_name <=", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameLike(String value) {
addCriterion("profit_sharing_receivers_name like", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameNotLike(String value) {
addCriterion("profit_sharing_receivers_name not like", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameIn(List<String> values) {
addCriterion("profit_sharing_receivers_name in", values, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameNotIn(List<String> values) {
addCriterion("profit_sharing_receivers_name not in", values, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameBetween(String value1, String value2) {
addCriterion("profit_sharing_receivers_name between", value1, value2, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameNotBetween(String value1, String value2) {
addCriterion("profit_sharing_receivers_name not between", value1, value2, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andStatusIsNull() {
addCriterion("`status` is null");
return (Criteria) this;

@ -180,6 +180,16 @@ public class HighOrder implements Serializable {
*/
private String accountMerchantNum;
/**
* 打印状态
*/
private Boolean printStatus;
/**
* 打印次数
*/
private Integer printNum;
private String ext1;
private String ext2;
@ -482,6 +492,22 @@ public class HighOrder implements Serializable {
this.accountMerchantNum = accountMerchantNum;
}
public Boolean getPrintStatus() {
return printStatus;
}
public void setPrintStatus(Boolean printStatus) {
this.printStatus = printStatus;
}
public Integer getPrintNum() {
return printNum;
}
public void setPrintNum(Integer printNum) {
this.printNum = printNum;
}
public String getExt1() {
return ext1;
}
@ -551,6 +577,8 @@ public class HighOrder implements Serializable {
&& (this.getProfitSharingStatus() == null ? other.getProfitSharingStatus() == null : this.getProfitSharingStatus().equals(other.getProfitSharingStatus()))
&& (this.getProfitSharingRatio() == null ? other.getProfitSharingRatio() == null : this.getProfitSharingRatio().equals(other.getProfitSharingRatio()))
&& (this.getAccountMerchantNum() == null ? other.getAccountMerchantNum() == null : this.getAccountMerchantNum().equals(other.getAccountMerchantNum()))
&& (this.getPrintStatus() == null ? other.getPrintStatus() == null : this.getPrintStatus().equals(other.getPrintStatus()))
&& (this.getPrintNum() == null ? other.getPrintNum() == null : this.getPrintNum().equals(other.getPrintNum()))
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
&& (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
&& (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()));
@ -593,6 +621,8 @@ public class HighOrder implements Serializable {
result = prime * result + ((getProfitSharingStatus() == null) ? 0 : getProfitSharingStatus().hashCode());
result = prime * result + ((getProfitSharingRatio() == null) ? 0 : getProfitSharingRatio().hashCode());
result = prime * result + ((getAccountMerchantNum() == null) ? 0 : getAccountMerchantNum().hashCode());
result = prime * result + ((getPrintStatus() == null) ? 0 : getPrintStatus().hashCode());
result = prime * result + ((getPrintNum() == null) ? 0 : getPrintNum().hashCode());
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
@ -638,6 +668,8 @@ public class HighOrder implements Serializable {
sb.append(", profitSharingStatus=").append(profitSharingStatus);
sb.append(", profitSharingRatio=").append(profitSharingRatio);
sb.append(", accountMerchantNum=").append(accountMerchantNum);
sb.append(", printStatus=").append(printStatus);
sb.append(", printNum=").append(printNum);
sb.append(", ext1=").append(ext1);
sb.append(", ext2=").append(ext2);
sb.append(", ext3=").append(ext3);

@ -2216,6 +2216,126 @@ public class HighOrderExample {
return (Criteria) this;
}
public Criteria andPrintStatusIsNull() {
addCriterion("print_status is null");
return (Criteria) this;
}
public Criteria andPrintStatusIsNotNull() {
addCriterion("print_status is not null");
return (Criteria) this;
}
public Criteria andPrintStatusEqualTo(Boolean value) {
addCriterion("print_status =", value, "printStatus");
return (Criteria) this;
}
public Criteria andPrintStatusNotEqualTo(Boolean value) {
addCriterion("print_status <>", value, "printStatus");
return (Criteria) this;
}
public Criteria andPrintStatusGreaterThan(Boolean value) {
addCriterion("print_status >", value, "printStatus");
return (Criteria) this;
}
public Criteria andPrintStatusGreaterThanOrEqualTo(Boolean value) {
addCriterion("print_status >=", value, "printStatus");
return (Criteria) this;
}
public Criteria andPrintStatusLessThan(Boolean value) {
addCriterion("print_status <", value, "printStatus");
return (Criteria) this;
}
public Criteria andPrintStatusLessThanOrEqualTo(Boolean value) {
addCriterion("print_status <=", value, "printStatus");
return (Criteria) this;
}
public Criteria andPrintStatusIn(List<Boolean> values) {
addCriterion("print_status in", values, "printStatus");
return (Criteria) this;
}
public Criteria andPrintStatusNotIn(List<Boolean> values) {
addCriterion("print_status not in", values, "printStatus");
return (Criteria) this;
}
public Criteria andPrintStatusBetween(Boolean value1, Boolean value2) {
addCriterion("print_status between", value1, value2, "printStatus");
return (Criteria) this;
}
public Criteria andPrintStatusNotBetween(Boolean value1, Boolean value2) {
addCriterion("print_status not between", value1, value2, "printStatus");
return (Criteria) this;
}
public Criteria andPrintNumIsNull() {
addCriterion("print_num is null");
return (Criteria) this;
}
public Criteria andPrintNumIsNotNull() {
addCriterion("print_num is not null");
return (Criteria) this;
}
public Criteria andPrintNumEqualTo(Integer value) {
addCriterion("print_num =", value, "printNum");
return (Criteria) this;
}
public Criteria andPrintNumNotEqualTo(Integer value) {
addCriterion("print_num <>", value, "printNum");
return (Criteria) this;
}
public Criteria andPrintNumGreaterThan(Integer value) {
addCriterion("print_num >", value, "printNum");
return (Criteria) this;
}
public Criteria andPrintNumGreaterThanOrEqualTo(Integer value) {
addCriterion("print_num >=", value, "printNum");
return (Criteria) this;
}
public Criteria andPrintNumLessThan(Integer value) {
addCriterion("print_num <", value, "printNum");
return (Criteria) this;
}
public Criteria andPrintNumLessThanOrEqualTo(Integer value) {
addCriterion("print_num <=", value, "printNum");
return (Criteria) this;
}
public Criteria andPrintNumIn(List<Integer> values) {
addCriterion("print_num in", values, "printNum");
return (Criteria) this;
}
public Criteria andPrintNumNotIn(List<Integer> values) {
addCriterion("print_num not in", values, "printNum");
return (Criteria) this;
}
public Criteria andPrintNumBetween(Integer value1, Integer value2) {
addCriterion("print_num between", value1, value2, "printNum");
return (Criteria) this;
}
public Criteria andPrintNumNotBetween(Integer value1, Integer value2) {
addCriterion("print_num not between", value1, value2, "printNum");
return (Criteria) this;
}
public Criteria andExt1IsNull() {
addCriterion("ext_1 is null");
return (Criteria) this;

@ -34,6 +34,24 @@ public class GasOrderModel {
private Date refundTime;
private BigDecimal refundPrice;
private String refundContent;
private Boolean printStatus;
private Integer printNum;
public Boolean getPrintStatus() {
return printStatus;
}
public void setPrintStatus(Boolean printStatus) {
this.printStatus = printStatus;
}
public Integer getPrintNum() {
return printNum;
}
public void setPrintNum(Integer printNum) {
this.printNum = printNum;
}
public BigDecimal getRefundPrice() {
return refundPrice;

@ -70,6 +70,13 @@ public interface HighMerchantStoreService {
*/
HighMerchantStore getDetailById(Long id);
/**
* 查询门店列表
* @param merId
* @return
*/
List<HighMerchantStore> getStoreListByMer(Long merId);
/**
* @Author 胡锐
* @Description 查询门店列表

@ -142,6 +142,8 @@ public class HighGasOilPriceOfficialServiceImpl implements HighGasOilPriceOffici
List<HighGasOilPrice> list = highGasOilPriceService.getPriceListByRegionAndOilNo(priceOfficial.getRegionId(), priceOfficial.getOilNo());
for (HighGasOilPrice gasOilPrice : list) {
gasOilPrice.setPriceOfficial(priceOfficial.getPriceOfficial());
gasOilPrice.setPriceGun(priceOfficial.getPriceOfficial());
gasOilPrice.setPriceVip(priceOfficial.getPriceOfficial().subtract(gasOilPrice.getPreferentialMargin()));
highGasOilPriceService.editGasOilPrice(gasOilPrice);
}
}

@ -98,9 +98,7 @@ public class HighGasOilPriceTaskServiceImpl implements HighGasOilPriceTaskServic
}
gasOilPriceOfficialService.editPrice(gasOilPriceTask.getRegionId(), gasOilPriceTask.getOilNo(), gasOilPriceTask.getPrice());
new Thread(() -> {
gasOilPriceOfficialService.refreshGasPriceOfficial(gasOilPriceTask.getRegionId(), gasOilPriceTask.getOilNo());
}).start();
gasOilPriceOfficialService.refreshGasPriceOfficial(gasOilPriceTask.getRegionId(), gasOilPriceTask.getOilNo());
}
// 油站价

@ -170,6 +170,13 @@ public class HighMerchantStoreServiceImpl implements HighMerchantStoreService {
return highMerchantStoreMapper.selectByPrimaryKey(id);
}
@Override
public List<HighMerchantStore> getStoreListByMer(Long merId) {
HighMerchantStoreExample example = new HighMerchantStoreExample();
example.createCriteria().andMerchantIdEqualTo(merId);
return highMerchantStoreMapper.selectByExample(example);
}
@Override
public List<HighMerchantStore> getMerchantStoreList(Map<String, Object> map) {
HighMerchantStoreExample example = new HighMerchantStoreExample();

@ -378,36 +378,40 @@ public class HighOrderServiceImpl implements HighOrderService {
// 扣预存款
this.redisTemplate.boundListOps(MsgTopic.MerStoreAccount.getName()).leftPush(pushParam);
}
new Thread(() -> {
try {
SpPrinterConfig sp = new SpPrinterConfig();
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilCashierStubTemp(
highChildOrder.getGoodsName(),
highOrder.getOrderNo(),
DateUtil.date2String(highOrder.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
highOrder.getTotalPrice().toString()
), 1);
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilClientStubTemp(
highChildOrder.getGoodsName(),
highOrder.getOrderNo(),
DateUtil.date2String(highOrder.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
highOrder.getTotalPrice().toString()
), 1);
} catch (Exception e) {
e.printStackTrace();
}
}).start();
if (StringUtils.isNotBlank(store.getDeviceSn())) {
new Thread(() -> {
try {
SpPrinterConfig sp = new SpPrinterConfig();
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilCashierStubTemp(
highChildOrder.getGoodsName(),
highOrder.getOrderNo(),
DateUtil.date2String(highOrder.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
highOrder.getTotalPrice().toString()
), 1);
Thread.sleep(6000);
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilClientStubTemp(
highChildOrder.getGoodsName(),
highOrder.getOrderNo(),
DateUtil.date2String(highOrder.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
highOrder.getTotalPrice().toString()
), 1);
} catch (Exception e) {
e.printStackTrace();
}
}).start();
}
} else if (store.getSourceType().equals(2)) {
// 推送团油订单
Map<String,Object> paramMap = new HashMap<>();
@ -673,36 +677,39 @@ public class HighOrderServiceImpl implements HighOrderService {
// 扣预存款
this.redisTemplate.boundListOps(MsgTopic.MerStoreAccount.getName()).leftPush(pushParam);
}
new Thread(() -> {
try {
SpPrinterConfig sp = new SpPrinterConfig();
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilCashierStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilClientStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
} catch (Exception e) {
e.printStackTrace();
}
}).start();
if (StringUtils.isNotBlank(store.getDeviceSn())) {
new Thread(() -> {
try {
SpPrinterConfig sp = new SpPrinterConfig();
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilCashierStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
Thread.sleep(6000);
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilClientStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
} catch (Exception e) {
e.printStackTrace();
}
}).start();
}
} else if (store.getSourceType().equals(2)) {
// 推送团油订单
Map<String,Object> paramMap = new HashMap<>();
@ -1005,36 +1012,39 @@ public class HighOrderServiceImpl implements HighOrderService {
// 扣预存款
this.redisTemplate.boundListOps(MsgTopic.MerStoreAccount.getName()).leftPush(pushParam);
}
new Thread(() -> {
try {
SpPrinterConfig sp = new SpPrinterConfig();
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilCashierStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilClientStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
} catch (Exception e) {
e.printStackTrace();
}
}).start();
if (StringUtils.isNotBlank(store.getDeviceSn())) {
new Thread(() -> {
try {
SpPrinterConfig sp = new SpPrinterConfig();
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilCashierStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
Thread.sleep(6000);
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilClientStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
} catch (Exception e) {
e.printStackTrace();
}
}).start();
}
} else if (store.getSourceType().equals(2)) {
// 推送团油订单
Map<String,Object> paramMap = new HashMap<>();

@ -25,6 +25,7 @@ import com.hai.service.*;
import com.hai.service.pay.NotifyService;
import com.hai.service.pay.PayService;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
@ -298,36 +299,41 @@ public class GoodsOrderServiceImpl implements PayService {
// 扣预存款
this.redisTemplate.boundListOps(MsgTopic.MerStoreAccount.getName()).leftPush(pushParam);
}
new Thread(() -> {
try {
SpPrinterConfig sp = new SpPrinterConfig();
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilCashierStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilClientStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
} catch (Exception e) {
e.printStackTrace();
}
}).start();
if (StringUtils.isNotBlank(store.getDeviceSn())) {
new Thread(() -> {
try {
SpPrinterConfig sp = new SpPrinterConfig();
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilCashierStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
Thread.sleep(6000);
sp.print(store.getDeviceSn(),
SpPrinterTemplate.oilClientStubTemp(
highChildOrder.getGoodsName(),
order.getOrderNo(),
DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
"嗨森逛",
highChildOrder.getGasGunNo(),
highChildOrder.getGasOilNo(),
highChildOrder.getGasOilLiters().toString(),
order.getTotalPrice().toString()
), 1);
} catch (Exception e) {
e.printStackTrace();
}
}).start();
}
} else if (store.getSourceType().equals(2)) {
// 推送团油订单
Map<String,Object> paramMap = new HashMap<>();

Binary file not shown.

@ -1,4 +0,0 @@
#Created by Apache Maven 3.8.2
version=1.0-SNAPSHOT
groupId=com.hgj
artifactId=hai-v1

@ -1,11 +0,0 @@
com/V1Application.class
com/v1/config/SignatureConfig.class
com/v1/config/AuthConfig$1.class
com/v1/config/SysConfig.class
com/v1/config/ConfigListener.class
com/v1/config/SwaggerConfig.class
com/v1/config/CorsConfig.class
com/v1/config/AuthConfig.class
com/v1/config/RedisConfig.class
com/v1/config/SysConst.class
com/v1/config/MultipartConfig.class

@ -1,10 +0,0 @@
/Volumes/work/code/high-work/hai-server/v1/src/main/java/com/v1/config/SysConst.java
/Volumes/work/code/high-work/hai-server/v1/src/main/java/com/v1/config/RedisConfig.java
/Volumes/work/code/high-work/hai-server/v1/src/main/java/com/v1/config/AuthConfig.java
/Volumes/work/code/high-work/hai-server/v1/src/main/java/com/v1/config/SwaggerConfig.java
/Volumes/work/code/high-work/hai-server/v1/src/main/java/com/v1/config/ConfigListener.java
/Volumes/work/code/high-work/hai-server/v1/src/main/java/com/V1Application.java
/Volumes/work/code/high-work/hai-server/v1/src/main/java/com/v1/config/MultipartConfig.java
/Volumes/work/code/high-work/hai-server/v1/src/main/java/com/v1/config/SignatureConfig.java
/Volumes/work/code/high-work/hai-server/v1/src/main/java/com/v1/config/CorsConfig.java
/Volumes/work/code/high-work/hai-server/v1/src/main/java/com/v1/config/SysConfig.java
Loading…
Cancel
Save