new-dev
袁野 1 year ago
parent 83a6d1561f
commit 2f5493af1d
  1. 3
      hai-bweb/src/main/java/com/bweb/config/msg/MerStoreAccountChgHandler.java
  2. 4
      hai-bweb/src/main/java/com/bweb/controller/ApiMerchantsController.java
  3. 2
      hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
  4. 19
      hai-cweb/src/main/java/com/cweb/controller/Goods/ShoppingCartController.java
  5. 73
      hai-order/src/main/java/com/web/controller/OrderController.java
  6. 89
      hai-service/src/main/java/com/hai/dao/TbRechargePayOrderMapper.java
  7. 7
      hai-service/src/main/java/com/hai/dao/TbRechargePayOrderMapperExt.java
  8. 373
      hai-service/src/main/java/com/hai/dao/TbRechargePayOrderSqlProvider.java
  9. 323
      hai-service/src/main/java/com/hai/entity/TbRechargePayOrder.java
  10. 1634
      hai-service/src/main/java/com/hai/entity/TbRechargePayOrderExample.java
  11. 276
      hai-service/src/main/java/com/hai/entity/TbRechargePayOrderWithBLOBs.java
  12. 59
      hai-service/src/main/java/com/hai/order/model/combine/CreateCombine.java
  13. 14
      hai-service/src/main/java/com/hai/order/service/OrderService.java
  14. 14
      hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
  15. 3
      hai-service/src/main/java/com/hai/service/SecUserService.java
  16. 11
      hai-service/src/main/java/com/hai/service/TestService.java
  17. 13
      hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java
  18. 7
      hai-service/src/main/java/com/hai/service/impl/SecUserServiceImpl.java
  19. 13
      hai-service/src/main/java/com/hai/service/impl/TestServiceImpl.java

@ -28,9 +28,6 @@ public class MerStoreAccountChgHandler {
@Resource
private HighMerchantStoreAccountService merchantStoreAccountService;
@Resource
private HighOrderService orderService;
@PostConstruct
public void init() {
new Thread(() -> {

@ -67,12 +67,10 @@ public class ApiMerchantsController {
@RequestParam(value = "phone", required = false) String phone,
@RequestParam(value = "status", required = false) Integer status,
@RequestParam(name = "pageNum", required = true) Integer pageNum,
@RequestParam(name = "pageSize", required = true) Integer pageSize, HttpServletRequest request
@RequestParam(name = "pageSize", required = true) Integer pageSize
) {
try {
SessionObject sessionObject = userCenter.getSessionObject(request);
UserInfoModel userInfoModel = (UserInfoModel) sessionObject.getObject();
Map<String, Object> map = new HashMap<>();

File diff suppressed because one or more lines are too long

@ -1,5 +1,6 @@
package com.cweb.controller.Goods;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.domain.Shop;
import com.hai.common.exception.ErrorCode;
import com.hai.common.exception.ErrorHelp;
@ -7,15 +8,14 @@ import com.hai.common.exception.SysCode;
import com.hai.common.security.SessionObject;
import com.hai.common.security.UserCenter;
import com.hai.common.utils.ResponseMsgUtil;
import com.hai.entity.GoodsDetail;
import com.hai.entity.GoodsShoppingCart;
import com.hai.entity.GoodsSku;
import com.hai.entity.*;
import com.hai.goods.model.ShoppingCartModel;
import com.hai.goods.service.GoodsDetailService;
import com.hai.goods.service.GoodsSkuService;
import com.hai.goods.service.ShoppingCartService;
import com.hai.model.HighUserModel;
import com.hai.model.ResponseData;
import com.hai.service.SecUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.stream.Collectors;
@Controller
@RequestMapping(value = "/shoppingCart")
@ -91,7 +92,17 @@ public class ShoppingCartController {
}
return ResponseMsgUtil.success(shoppingCartModels);
Map<String, List<ShoppingCartModel>> collect = shoppingCartModels.stream().collect(Collectors.groupingBy(ShoppingCartModel::getOpName));
List<JSONObject> countRecords = collect.keySet().stream().map(key -> {
JSONObject goodObject = new JSONObject(true);
goodObject.put("name",key.toUpperCase());
goodObject.put("list",collect.get(key));
System.out.println(goodObject);
return goodObject;
}).collect(Collectors.toList());
return ResponseMsgUtil.success(countRecords);
} catch (Exception e) {
log.error("GoodsDetailController --> getListUser() error!", e);

@ -179,76 +179,15 @@ public class OrderController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.NO_BIND_PHONE, "");
}
String combineOrderNo = OrderUtil.generateOrderNo();
List<CreateOrderModel> orderModels = createCombine.getCreateOrderModel();
for (CreateOrderModel body : orderModels) {
body.setMemId(userModel.getHighUser().getId());
body.setMemName(userModel.getHighUser().getName());
body.setMemPhone(userModel.getHighUser().getPhone());
if (body.getChildOrderList() == null || body.getChildOrderList().size() == 0) {
log.error("OrderController -> create() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
for (CreateOrderChildModel childModel : body.getChildOrderList()) {
childModel.setMemId(body.getMemId());
childModel.setMemName(body.getMemName());
childModel.setMemPhone(body.getMemPhone());
createCombine.setMemId(userModel.getHighUser().getId());
createCombine.setMemName(userModel.getHighUser().getName());
createCombine.setMemPhone(userModel.getHighUser().getPhone());
// 校验子订单参数
if (childModel.getGoodsType() == null
|| OrderChildGoodsType.getDataByType(childModel.getGoodsType()) == null
|| childModel.getGoodsId() == null
|| childModel.getSaleCount() == null) {
log.error("OrderController -> create() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
if (childModel.getGoodsType().equals(OrderChildGoodsType.TYPE1.getNumber())
|| childModel.getGoodsType().equals(OrderChildGoodsType.TYPE8.getNumber())) {
if (childModel.getGoodsPrice() == null) {
log.error("OrderController -> create() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未填写充值金额");
}
} else if (childModel.getGoodsType().equals(OrderChildGoodsType.TYPE3.getNumber())) {
if (childModel.getGoodsPrice() == null || childModel.getGasOilNo() == null || childModel.getGasGunNo() == null) {
log.error("OrderController -> create() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未填写加油信息;加油金额、油号、抢号");
}
} else if (childModel.getGoodsType().equals(OrderChildGoodsType.TYPE6.getNumber())) {
if (childModel.getRechargeContent() == null) {
log.error("OrderController -> create() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请输入充值内容!");
}
} else if (childModel.getGoodsType().equals(OrderChildGoodsType.TYPE4.getNumber()) || childModel.getGoodsType().equals(OrderChildGoodsType.TYPE9.getNumber())|| childModel.getGoodsType().equals(OrderChildGoodsType.TYPE10.getNumber())) {
if (childModel.getCustomerMobile() == null) {
log.error("OrderController -> create() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请输入下单手机号!");
}
} else if (childModel.getGoodsType().equals(OrderChildGoodsType.TYPE11.getNumber())) {
if (childModel.getSkuId() == null) {
log.error("OrderController -> create() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请选择规格!");
}
if (body.getDeliveryAddressId() == null) {
log.error("OrderController -> create() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请选择收货地址!");
}
}
}
String combineOrderNo = OrderUtil.generateOrderNo();
body.setOrderNo(OrderUtil.generateOrderNo());
body.setCombineOrderNo(combineOrderNo);
orderService.createOrder(body);
}
createCombine.setCombineOrderNo(combineOrderNo);
return ResponseMsgUtil.success(combineOrderNo);
return ResponseMsgUtil.success(orderService.createOrderCombine(createCombine));
} catch (Exception e) {
log.error("OrderController -> create() error!",e);

@ -1,89 +0,0 @@
package com.hai.dao;
import com.hai.entity.TbRechargePayOrder;
import com.hai.entity.TbRechargePayOrderExample;
import java.util.List;
import org.apache.ibatis.annotations.DeleteProvider;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.annotations.UpdateProvider;
import org.apache.ibatis.type.JdbcType;
import org.springframework.stereotype.Repository;
/**
*
* 代码由工具生成,请勿修改!!!
* 如果需要扩展请在其父类进行扩展
*
**/
@Repository
public interface TbRechargePayOrderMapper extends TbRechargePayOrderMapperExt {
@SelectProvider(type=TbRechargePayOrderSqlProvider.class, method="countByExample")
long countByExample(TbRechargePayOrderExample example);
@DeleteProvider(type=TbRechargePayOrderSqlProvider.class, method="deleteByExample")
int deleteByExample(TbRechargePayOrderExample example);
@Insert({
"insert into tb_recharge_pay_order (rechargeId, phone, ",
"couNo, `status`, distributorId, ",
"validStartDate, validEndDate, ",
"distCouCount, couTypeCode, ",
"createtime, `createuser`, ",
"modifytime, modifyuser, ",
"preBalance, postBalance, ",
"billVersion, reconVersion, ",
"promoterId, access_type, ",
"staticCheckCode, use_shop)",
"values (#{rechargeid,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, ",
"#{couno,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{distributorid,jdbcType=VARCHAR}, ",
"#{validstartdate,jdbcType=TIMESTAMP}, #{validenddate,jdbcType=TIMESTAMP}, ",
"#{distcoucount,jdbcType=VARCHAR}, #{coutypecode,jdbcType=VARCHAR}, ",
"#{createtime,jdbcType=TIMESTAMP}, #{createuser,jdbcType=VARCHAR}, ",
"#{modifytime,jdbcType=TIMESTAMP}, #{modifyuser,jdbcType=VARCHAR}, ",
"#{prebalance,jdbcType=DECIMAL}, #{postbalance,jdbcType=DECIMAL}, ",
"#{billversion,jdbcType=VARCHAR}, #{reconversion,jdbcType=VARCHAR}, ",
"#{promoterid,jdbcType=VARCHAR}, #{accessType,jdbcType=VARCHAR}, ",
"#{staticcheckcode,jdbcType=VARCHAR}, #{useShop,jdbcType=VARCHAR})"
})
int insert(TbRechargePayOrder record);
@InsertProvider(type=TbRechargePayOrderSqlProvider.class, method="insertSelective")
int insertSelective(TbRechargePayOrder record);
@SelectProvider(type=TbRechargePayOrderSqlProvider.class, method="selectByExample")
@Results({
@Result(column="rechargeId", property="rechargeid", jdbcType=JdbcType.VARCHAR),
@Result(column="phone", property="phone", jdbcType=JdbcType.VARCHAR),
@Result(column="couNo", property="couno", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.VARCHAR),
@Result(column="distributorId", property="distributorid", jdbcType=JdbcType.VARCHAR),
@Result(column="validStartDate", property="validstartdate", jdbcType=JdbcType.TIMESTAMP),
@Result(column="validEndDate", property="validenddate", jdbcType=JdbcType.TIMESTAMP),
@Result(column="distCouCount", property="distcoucount", jdbcType=JdbcType.VARCHAR),
@Result(column="couTypeCode", property="coutypecode", jdbcType=JdbcType.VARCHAR),
@Result(column="createtime", property="createtime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="createuser", property="createuser", jdbcType=JdbcType.VARCHAR),
@Result(column="modifytime", property="modifytime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="modifyuser", property="modifyuser", jdbcType=JdbcType.VARCHAR),
@Result(column="preBalance", property="prebalance", jdbcType=JdbcType.DECIMAL),
@Result(column="postBalance", property="postbalance", jdbcType=JdbcType.DECIMAL),
@Result(column="billVersion", property="billversion", jdbcType=JdbcType.VARCHAR),
@Result(column="reconVersion", property="reconversion", jdbcType=JdbcType.VARCHAR),
@Result(column="promoterId", property="promoterid", jdbcType=JdbcType.VARCHAR),
@Result(column="access_type", property="accessType", jdbcType=JdbcType.VARCHAR),
@Result(column="staticCheckCode", property="staticcheckcode", jdbcType=JdbcType.VARCHAR),
@Result(column="use_shop", property="useShop", jdbcType=JdbcType.VARCHAR)
})
List<TbRechargePayOrder> selectByExample(TbRechargePayOrderExample example);
@UpdateProvider(type=TbRechargePayOrderSqlProvider.class, method="updateByExampleSelective")
int updateByExampleSelective(@Param("record") TbRechargePayOrder record, @Param("example") TbRechargePayOrderExample example);
@UpdateProvider(type=TbRechargePayOrderSqlProvider.class, method="updateByExample")
int updateByExample(@Param("record") TbRechargePayOrder record, @Param("example") TbRechargePayOrderExample example);
}

@ -1,7 +0,0 @@
package com.hai.dao;
/**
* mapper扩展类
*/
public interface TbRechargePayOrderMapperExt {
}

@ -1,373 +0,0 @@
package com.hai.dao;
import com.hai.entity.TbRechargePayOrder;
import com.hai.entity.TbRechargePayOrderExample.Criteria;
import com.hai.entity.TbRechargePayOrderExample.Criterion;
import com.hai.entity.TbRechargePayOrderExample;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.jdbc.SQL;
public class TbRechargePayOrderSqlProvider {
public String countByExample(TbRechargePayOrderExample example) {
SQL sql = new SQL();
sql.SELECT("count(*)").FROM("tb_recharge_pay_order");
applyWhere(sql, example, false);
return sql.toString();
}
public String deleteByExample(TbRechargePayOrderExample example) {
SQL sql = new SQL();
sql.DELETE_FROM("tb_recharge_pay_order");
applyWhere(sql, example, false);
return sql.toString();
}
public String insertSelective(TbRechargePayOrder record) {
SQL sql = new SQL();
sql.INSERT_INTO("tb_recharge_pay_order");
if (record.getRechargeid() != null) {
sql.VALUES("rechargeId", "#{rechargeid,jdbcType=VARCHAR}");
}
if (record.getPhone() != null) {
sql.VALUES("phone", "#{phone,jdbcType=VARCHAR}");
}
if (record.getCouno() != null) {
sql.VALUES("couNo", "#{couno,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.VALUES("`status`", "#{status,jdbcType=VARCHAR}");
}
if (record.getDistributorid() != null) {
sql.VALUES("distributorId", "#{distributorid,jdbcType=VARCHAR}");
}
if (record.getValidstartdate() != null) {
sql.VALUES("validStartDate", "#{validstartdate,jdbcType=TIMESTAMP}");
}
if (record.getValidenddate() != null) {
sql.VALUES("validEndDate", "#{validenddate,jdbcType=TIMESTAMP}");
}
if (record.getDistcoucount() != null) {
sql.VALUES("distCouCount", "#{distcoucount,jdbcType=VARCHAR}");
}
if (record.getCoutypecode() != null) {
sql.VALUES("couTypeCode", "#{coutypecode,jdbcType=VARCHAR}");
}
if (record.getCreatetime() != null) {
sql.VALUES("createtime", "#{createtime,jdbcType=TIMESTAMP}");
}
if (record.getCreateuser() != null) {
sql.VALUES("`createuser`", "#{createuser,jdbcType=VARCHAR}");
}
if (record.getModifytime() != null) {
sql.VALUES("modifytime", "#{modifytime,jdbcType=TIMESTAMP}");
}
if (record.getModifyuser() != null) {
sql.VALUES("modifyuser", "#{modifyuser,jdbcType=VARCHAR}");
}
if (record.getPrebalance() != null) {
sql.VALUES("preBalance", "#{prebalance,jdbcType=DECIMAL}");
}
if (record.getPostbalance() != null) {
sql.VALUES("postBalance", "#{postbalance,jdbcType=DECIMAL}");
}
if (record.getBillversion() != null) {
sql.VALUES("billVersion", "#{billversion,jdbcType=VARCHAR}");
}
if (record.getReconversion() != null) {
sql.VALUES("reconVersion", "#{reconversion,jdbcType=VARCHAR}");
}
if (record.getPromoterid() != null) {
sql.VALUES("promoterId", "#{promoterid,jdbcType=VARCHAR}");
}
if (record.getAccessType() != null) {
sql.VALUES("access_type", "#{accessType,jdbcType=VARCHAR}");
}
if (record.getStaticcheckcode() != null) {
sql.VALUES("staticCheckCode", "#{staticcheckcode,jdbcType=VARCHAR}");
}
if (record.getUseShop() != null) {
sql.VALUES("use_shop", "#{useShop,jdbcType=VARCHAR}");
}
return sql.toString();
}
public String selectByExample(TbRechargePayOrderExample example) {
SQL sql = new SQL();
if (example != null && example.isDistinct()) {
sql.SELECT_DISTINCT("rechargeId");
} else {
sql.SELECT("rechargeId");
}
sql.SELECT("phone");
sql.SELECT("couNo");
sql.SELECT("`status`");
sql.SELECT("distributorId");
sql.SELECT("validStartDate");
sql.SELECT("validEndDate");
sql.SELECT("distCouCount");
sql.SELECT("couTypeCode");
sql.SELECT("createtime");
sql.SELECT("`createuser`");
sql.SELECT("modifytime");
sql.SELECT("modifyuser");
sql.SELECT("preBalance");
sql.SELECT("postBalance");
sql.SELECT("billVersion");
sql.SELECT("reconVersion");
sql.SELECT("promoterId");
sql.SELECT("access_type");
sql.SELECT("staticCheckCode");
sql.SELECT("use_shop");
sql.FROM("tb_recharge_pay_order");
applyWhere(sql, example, false);
if (example != null && example.getOrderByClause() != null) {
sql.ORDER_BY(example.getOrderByClause());
}
return sql.toString();
}
public String updateByExampleSelective(Map<String, Object> parameter) {
TbRechargePayOrder record = (TbRechargePayOrder) parameter.get("record");
TbRechargePayOrderExample example = (TbRechargePayOrderExample) parameter.get("example");
SQL sql = new SQL();
sql.UPDATE("tb_recharge_pay_order");
if (record.getRechargeid() != null) {
sql.SET("rechargeId = #{record.rechargeid,jdbcType=VARCHAR}");
}
if (record.getPhone() != null) {
sql.SET("phone = #{record.phone,jdbcType=VARCHAR}");
}
if (record.getCouno() != null) {
sql.SET("couNo = #{record.couno,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{record.status,jdbcType=VARCHAR}");
}
if (record.getDistributorid() != null) {
sql.SET("distributorId = #{record.distributorid,jdbcType=VARCHAR}");
}
if (record.getValidstartdate() != null) {
sql.SET("validStartDate = #{record.validstartdate,jdbcType=TIMESTAMP}");
}
if (record.getValidenddate() != null) {
sql.SET("validEndDate = #{record.validenddate,jdbcType=TIMESTAMP}");
}
if (record.getDistcoucount() != null) {
sql.SET("distCouCount = #{record.distcoucount,jdbcType=VARCHAR}");
}
if (record.getCoutypecode() != null) {
sql.SET("couTypeCode = #{record.coutypecode,jdbcType=VARCHAR}");
}
if (record.getCreatetime() != null) {
sql.SET("createtime = #{record.createtime,jdbcType=TIMESTAMP}");
}
if (record.getCreateuser() != null) {
sql.SET("`createuser` = #{record.createuser,jdbcType=VARCHAR}");
}
if (record.getModifytime() != null) {
sql.SET("modifytime = #{record.modifytime,jdbcType=TIMESTAMP}");
}
if (record.getModifyuser() != null) {
sql.SET("modifyuser = #{record.modifyuser,jdbcType=VARCHAR}");
}
if (record.getPrebalance() != null) {
sql.SET("preBalance = #{record.prebalance,jdbcType=DECIMAL}");
}
if (record.getPostbalance() != null) {
sql.SET("postBalance = #{record.postbalance,jdbcType=DECIMAL}");
}
if (record.getBillversion() != null) {
sql.SET("billVersion = #{record.billversion,jdbcType=VARCHAR}");
}
if (record.getReconversion() != null) {
sql.SET("reconVersion = #{record.reconversion,jdbcType=VARCHAR}");
}
if (record.getPromoterid() != null) {
sql.SET("promoterId = #{record.promoterid,jdbcType=VARCHAR}");
}
if (record.getAccessType() != null) {
sql.SET("access_type = #{record.accessType,jdbcType=VARCHAR}");
}
if (record.getStaticcheckcode() != null) {
sql.SET("staticCheckCode = #{record.staticcheckcode,jdbcType=VARCHAR}");
}
if (record.getUseShop() != null) {
sql.SET("use_shop = #{record.useShop,jdbcType=VARCHAR}");
}
applyWhere(sql, example, true);
return sql.toString();
}
public String updateByExample(Map<String, Object> parameter) {
SQL sql = new SQL();
sql.UPDATE("tb_recharge_pay_order");
sql.SET("rechargeId = #{record.rechargeid,jdbcType=VARCHAR}");
sql.SET("phone = #{record.phone,jdbcType=VARCHAR}");
sql.SET("couNo = #{record.couno,jdbcType=VARCHAR}");
sql.SET("`status` = #{record.status,jdbcType=VARCHAR}");
sql.SET("distributorId = #{record.distributorid,jdbcType=VARCHAR}");
sql.SET("validStartDate = #{record.validstartdate,jdbcType=TIMESTAMP}");
sql.SET("validEndDate = #{record.validenddate,jdbcType=TIMESTAMP}");
sql.SET("distCouCount = #{record.distcoucount,jdbcType=VARCHAR}");
sql.SET("couTypeCode = #{record.coutypecode,jdbcType=VARCHAR}");
sql.SET("createtime = #{record.createtime,jdbcType=TIMESTAMP}");
sql.SET("`createuser` = #{record.createuser,jdbcType=VARCHAR}");
sql.SET("modifytime = #{record.modifytime,jdbcType=TIMESTAMP}");
sql.SET("modifyuser = #{record.modifyuser,jdbcType=VARCHAR}");
sql.SET("preBalance = #{record.prebalance,jdbcType=DECIMAL}");
sql.SET("postBalance = #{record.postbalance,jdbcType=DECIMAL}");
sql.SET("billVersion = #{record.billversion,jdbcType=VARCHAR}");
sql.SET("reconVersion = #{record.reconversion,jdbcType=VARCHAR}");
sql.SET("promoterId = #{record.promoterid,jdbcType=VARCHAR}");
sql.SET("access_type = #{record.accessType,jdbcType=VARCHAR}");
sql.SET("staticCheckCode = #{record.staticcheckcode,jdbcType=VARCHAR}");
sql.SET("use_shop = #{record.useShop,jdbcType=VARCHAR}");
TbRechargePayOrderExample example = (TbRechargePayOrderExample) parameter.get("example");
applyWhere(sql, example, true);
return sql.toString();
}
protected void applyWhere(SQL sql, TbRechargePayOrderExample example, boolean includeExamplePhrase) {
if (example == null) {
return;
}
String parmPhrase1;
String parmPhrase1_th;
String parmPhrase2;
String parmPhrase2_th;
String parmPhrase3;
String parmPhrase3_th;
if (includeExamplePhrase) {
parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}";
parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}";
parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}";
parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
} else {
parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}";
parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}";
parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}";
parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
}
StringBuilder sb = new StringBuilder();
List<Criteria> oredCriteria = example.getOredCriteria();
boolean firstCriteria = true;
for (int i = 0; i < oredCriteria.size(); i++) {
Criteria criteria = oredCriteria.get(i);
if (criteria.isValid()) {
if (firstCriteria) {
firstCriteria = false;
} else {
sb.append(" or ");
}
sb.append('(');
List<Criterion> criterions = criteria.getAllCriteria();
boolean firstCriterion = true;
for (int j = 0; j < criterions.size(); j++) {
Criterion criterion = criterions.get(j);
if (firstCriterion) {
firstCriterion = false;
} else {
sb.append(" and ");
}
if (criterion.isNoValue()) {
sb.append(criterion.getCondition());
} else if (criterion.isSingleValue()) {
if (criterion.getTypeHandler() == null) {
sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j));
} else {
sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler()));
}
} else if (criterion.isBetweenValue()) {
if (criterion.getTypeHandler() == null) {
sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j));
} else {
sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler()));
}
} else if (criterion.isListValue()) {
sb.append(criterion.getCondition());
sb.append(" (");
List<?> listItems = (List<?>) criterion.getValue();
boolean comma = false;
for (int k = 0; k < listItems.size(); k++) {
if (comma) {
sb.append(", ");
} else {
comma = true;
}
if (criterion.getTypeHandler() == null) {
sb.append(String.format(parmPhrase3, i, j, k));
} else {
sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler()));
}
}
sb.append(')');
}
}
sb.append(')');
}
}
if (sb.length() > 0) {
sql.WHERE(sb.toString());
}
}
}

@ -1,323 +0,0 @@
package com.hai.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* tb_recharge_pay_order
* @author
*/
/**
*
* 代码由工具生成
*
**/
public class TbRechargePayOrder implements Serializable {
private String rechargeid;
private String phone;
private String couno;
private String status;
private String distributorid;
private Date validstartdate;
private Date validenddate;
private String distcoucount;
private String coutypecode;
private Date createtime;
private String createuser;
private Date modifytime;
private String modifyuser;
private BigDecimal prebalance;
private BigDecimal postbalance;
private String billversion;
private String reconversion;
private String promoterid;
private String accessType;
private String staticcheckcode;
private String useShop;
private static final long serialVersionUID = 1L;
public String getRechargeid() {
return rechargeid;
}
public void setRechargeid(String rechargeid) {
this.rechargeid = rechargeid;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getCouno() {
return couno;
}
public void setCouno(String couno) {
this.couno = couno;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getDistributorid() {
return distributorid;
}
public void setDistributorid(String distributorid) {
this.distributorid = distributorid;
}
public Date getValidstartdate() {
return validstartdate;
}
public void setValidstartdate(Date validstartdate) {
this.validstartdate = validstartdate;
}
public Date getValidenddate() {
return validenddate;
}
public void setValidenddate(Date validenddate) {
this.validenddate = validenddate;
}
public String getDistcoucount() {
return distcoucount;
}
public void setDistcoucount(String distcoucount) {
this.distcoucount = distcoucount;
}
public String getCoutypecode() {
return coutypecode;
}
public void setCoutypecode(String coutypecode) {
this.coutypecode = coutypecode;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
public String getCreateuser() {
return createuser;
}
public void setCreateuser(String createuser) {
this.createuser = createuser;
}
public Date getModifytime() {
return modifytime;
}
public void setModifytime(Date modifytime) {
this.modifytime = modifytime;
}
public String getModifyuser() {
return modifyuser;
}
public void setModifyuser(String modifyuser) {
this.modifyuser = modifyuser;
}
public BigDecimal getPrebalance() {
return prebalance;
}
public void setPrebalance(BigDecimal prebalance) {
this.prebalance = prebalance;
}
public BigDecimal getPostbalance() {
return postbalance;
}
public void setPostbalance(BigDecimal postbalance) {
this.postbalance = postbalance;
}
public String getBillversion() {
return billversion;
}
public void setBillversion(String billversion) {
this.billversion = billversion;
}
public String getReconversion() {
return reconversion;
}
public void setReconversion(String reconversion) {
this.reconversion = reconversion;
}
public String getPromoterid() {
return promoterid;
}
public void setPromoterid(String promoterid) {
this.promoterid = promoterid;
}
public String getAccessType() {
return accessType;
}
public void setAccessType(String accessType) {
this.accessType = accessType;
}
public String getStaticcheckcode() {
return staticcheckcode;
}
public void setStaticcheckcode(String staticcheckcode) {
this.staticcheckcode = staticcheckcode;
}
public String getUseShop() {
return useShop;
}
public void setUseShop(String useShop) {
this.useShop = useShop;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
TbRechargePayOrder other = (TbRechargePayOrder) that;
return (this.getRechargeid() == null ? other.getRechargeid() == null : this.getRechargeid().equals(other.getRechargeid()))
&& (this.getPhone() == null ? other.getPhone() == null : this.getPhone().equals(other.getPhone()))
&& (this.getCouno() == null ? other.getCouno() == null : this.getCouno().equals(other.getCouno()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getDistributorid() == null ? other.getDistributorid() == null : this.getDistributorid().equals(other.getDistributorid()))
&& (this.getValidstartdate() == null ? other.getValidstartdate() == null : this.getValidstartdate().equals(other.getValidstartdate()))
&& (this.getValidenddate() == null ? other.getValidenddate() == null : this.getValidenddate().equals(other.getValidenddate()))
&& (this.getDistcoucount() == null ? other.getDistcoucount() == null : this.getDistcoucount().equals(other.getDistcoucount()))
&& (this.getCoutypecode() == null ? other.getCoutypecode() == null : this.getCoutypecode().equals(other.getCoutypecode()))
&& (this.getCreatetime() == null ? other.getCreatetime() == null : this.getCreatetime().equals(other.getCreatetime()))
&& (this.getCreateuser() == null ? other.getCreateuser() == null : this.getCreateuser().equals(other.getCreateuser()))
&& (this.getModifytime() == null ? other.getModifytime() == null : this.getModifytime().equals(other.getModifytime()))
&& (this.getModifyuser() == null ? other.getModifyuser() == null : this.getModifyuser().equals(other.getModifyuser()))
&& (this.getPrebalance() == null ? other.getPrebalance() == null : this.getPrebalance().equals(other.getPrebalance()))
&& (this.getPostbalance() == null ? other.getPostbalance() == null : this.getPostbalance().equals(other.getPostbalance()))
&& (this.getBillversion() == null ? other.getBillversion() == null : this.getBillversion().equals(other.getBillversion()))
&& (this.getReconversion() == null ? other.getReconversion() == null : this.getReconversion().equals(other.getReconversion()))
&& (this.getPromoterid() == null ? other.getPromoterid() == null : this.getPromoterid().equals(other.getPromoterid()))
&& (this.getAccessType() == null ? other.getAccessType() == null : this.getAccessType().equals(other.getAccessType()))
&& (this.getStaticcheckcode() == null ? other.getStaticcheckcode() == null : this.getStaticcheckcode().equals(other.getStaticcheckcode()))
&& (this.getUseShop() == null ? other.getUseShop() == null : this.getUseShop().equals(other.getUseShop()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getRechargeid() == null) ? 0 : getRechargeid().hashCode());
result = prime * result + ((getPhone() == null) ? 0 : getPhone().hashCode());
result = prime * result + ((getCouno() == null) ? 0 : getCouno().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getDistributorid() == null) ? 0 : getDistributorid().hashCode());
result = prime * result + ((getValidstartdate() == null) ? 0 : getValidstartdate().hashCode());
result = prime * result + ((getValidenddate() == null) ? 0 : getValidenddate().hashCode());
result = prime * result + ((getDistcoucount() == null) ? 0 : getDistcoucount().hashCode());
result = prime * result + ((getCoutypecode() == null) ? 0 : getCoutypecode().hashCode());
result = prime * result + ((getCreatetime() == null) ? 0 : getCreatetime().hashCode());
result = prime * result + ((getCreateuser() == null) ? 0 : getCreateuser().hashCode());
result = prime * result + ((getModifytime() == null) ? 0 : getModifytime().hashCode());
result = prime * result + ((getModifyuser() == null) ? 0 : getModifyuser().hashCode());
result = prime * result + ((getPrebalance() == null) ? 0 : getPrebalance().hashCode());
result = prime * result + ((getPostbalance() == null) ? 0 : getPostbalance().hashCode());
result = prime * result + ((getBillversion() == null) ? 0 : getBillversion().hashCode());
result = prime * result + ((getReconversion() == null) ? 0 : getReconversion().hashCode());
result = prime * result + ((getPromoterid() == null) ? 0 : getPromoterid().hashCode());
result = prime * result + ((getAccessType() == null) ? 0 : getAccessType().hashCode());
result = prime * result + ((getStaticcheckcode() == null) ? 0 : getStaticcheckcode().hashCode());
result = prime * result + ((getUseShop() == null) ? 0 : getUseShop().hashCode());
return result;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", rechargeid=").append(rechargeid);
sb.append(", phone=").append(phone);
sb.append(", couno=").append(couno);
sb.append(", status=").append(status);
sb.append(", distributorid=").append(distributorid);
sb.append(", validstartdate=").append(validstartdate);
sb.append(", validenddate=").append(validenddate);
sb.append(", distcoucount=").append(distcoucount);
sb.append(", coutypecode=").append(coutypecode);
sb.append(", createtime=").append(createtime);
sb.append(", createuser=").append(createuser);
sb.append(", modifytime=").append(modifytime);
sb.append(", modifyuser=").append(modifyuser);
sb.append(", prebalance=").append(prebalance);
sb.append(", postbalance=").append(postbalance);
sb.append(", billversion=").append(billversion);
sb.append(", reconversion=").append(reconversion);
sb.append(", promoterid=").append(promoterid);
sb.append(", accessType=").append(accessType);
sb.append(", staticcheckcode=").append(staticcheckcode);
sb.append(", useShop=").append(useShop);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}

@ -1,276 +0,0 @@
package com.hai.entity;
import java.io.Serializable;
/**
* tb_recharge_pay_order
* @author
*/
public class TbRechargePayOrderWithBLOBs extends TbRechargePayOrder implements Serializable {
private String id;
private String rechargeid;
private String phone;
private String couno;
private String status;
private String distributorid;
private String distcoucount;
private String coutypecode;
private String createuser;
private String modifyuser;
private String billversion;
private String reconversion;
private String promoterid;
private String accessType;
private String staticcheckcode;
private String useShop;
private String useTime;
private static final long serialVersionUID = 1L;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getRechargeid() {
return rechargeid;
}
public void setRechargeid(String rechargeid) {
this.rechargeid = rechargeid;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getCouno() {
return couno;
}
public void setCouno(String couno) {
this.couno = couno;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getDistributorid() {
return distributorid;
}
public void setDistributorid(String distributorid) {
this.distributorid = distributorid;
}
public String getDistcoucount() {
return distcoucount;
}
public void setDistcoucount(String distcoucount) {
this.distcoucount = distcoucount;
}
public String getCoutypecode() {
return coutypecode;
}
public void setCoutypecode(String coutypecode) {
this.coutypecode = coutypecode;
}
public String getCreateuser() {
return createuser;
}
public void setCreateuser(String createuser) {
this.createuser = createuser;
}
public String getModifyuser() {
return modifyuser;
}
public void setModifyuser(String modifyuser) {
this.modifyuser = modifyuser;
}
public String getBillversion() {
return billversion;
}
public void setBillversion(String billversion) {
this.billversion = billversion;
}
public String getReconversion() {
return reconversion;
}
public void setReconversion(String reconversion) {
this.reconversion = reconversion;
}
public String getPromoterid() {
return promoterid;
}
public void setPromoterid(String promoterid) {
this.promoterid = promoterid;
}
public String getAccessType() {
return accessType;
}
public void setAccessType(String accessType) {
this.accessType = accessType;
}
public String getStaticcheckcode() {
return staticcheckcode;
}
public void setStaticcheckcode(String staticcheckcode) {
this.staticcheckcode = staticcheckcode;
}
public String getUseShop() {
return useShop;
}
public void setUseShop(String useShop) {
this.useShop = useShop;
}
public String getUseTime() {
return useTime;
}
public void setUseTime(String useTime) {
this.useTime = useTime;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
TbRechargePayOrderWithBLOBs other = (TbRechargePayOrderWithBLOBs) that;
return (this.getValidstartdate() == null ? other.getValidstartdate() == null : this.getValidstartdate().equals(other.getValidstartdate()))
&& (this.getValidenddate() == null ? other.getValidenddate() == null : this.getValidenddate().equals(other.getValidenddate()))
&& (this.getCreatetime() == null ? other.getCreatetime() == null : this.getCreatetime().equals(other.getCreatetime()))
&& (this.getModifytime() == null ? other.getModifytime() == null : this.getModifytime().equals(other.getModifytime()))
&& (this.getPrebalance() == null ? other.getPrebalance() == null : this.getPrebalance().equals(other.getPrebalance()))
&& (this.getPostbalance() == null ? other.getPostbalance() == null : this.getPostbalance().equals(other.getPostbalance()))
&& (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getRechargeid() == null ? other.getRechargeid() == null : this.getRechargeid().equals(other.getRechargeid()))
&& (this.getPhone() == null ? other.getPhone() == null : this.getPhone().equals(other.getPhone()))
&& (this.getCouno() == null ? other.getCouno() == null : this.getCouno().equals(other.getCouno()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getDistributorid() == null ? other.getDistributorid() == null : this.getDistributorid().equals(other.getDistributorid()))
&& (this.getDistcoucount() == null ? other.getDistcoucount() == null : this.getDistcoucount().equals(other.getDistcoucount()))
&& (this.getCoutypecode() == null ? other.getCoutypecode() == null : this.getCoutypecode().equals(other.getCoutypecode()))
&& (this.getCreateuser() == null ? other.getCreateuser() == null : this.getCreateuser().equals(other.getCreateuser()))
&& (this.getModifyuser() == null ? other.getModifyuser() == null : this.getModifyuser().equals(other.getModifyuser()))
&& (this.getBillversion() == null ? other.getBillversion() == null : this.getBillversion().equals(other.getBillversion()))
&& (this.getReconversion() == null ? other.getReconversion() == null : this.getReconversion().equals(other.getReconversion()))
&& (this.getPromoterid() == null ? other.getPromoterid() == null : this.getPromoterid().equals(other.getPromoterid()))
&& (this.getAccessType() == null ? other.getAccessType() == null : this.getAccessType().equals(other.getAccessType()))
&& (this.getStaticcheckcode() == null ? other.getStaticcheckcode() == null : this.getStaticcheckcode().equals(other.getStaticcheckcode()))
&& (this.getUseShop() == null ? other.getUseShop() == null : this.getUseShop().equals(other.getUseShop()))
&& (this.getUseTime() == null ? other.getUseTime() == null : this.getUseTime().equals(other.getUseTime()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getValidstartdate() == null) ? 0 : getValidstartdate().hashCode());
result = prime * result + ((getValidenddate() == null) ? 0 : getValidenddate().hashCode());
result = prime * result + ((getCreatetime() == null) ? 0 : getCreatetime().hashCode());
result = prime * result + ((getModifytime() == null) ? 0 : getModifytime().hashCode());
result = prime * result + ((getPrebalance() == null) ? 0 : getPrebalance().hashCode());
result = prime * result + ((getPostbalance() == null) ? 0 : getPostbalance().hashCode());
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getRechargeid() == null) ? 0 : getRechargeid().hashCode());
result = prime * result + ((getPhone() == null) ? 0 : getPhone().hashCode());
result = prime * result + ((getCouno() == null) ? 0 : getCouno().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getDistributorid() == null) ? 0 : getDistributorid().hashCode());
result = prime * result + ((getDistcoucount() == null) ? 0 : getDistcoucount().hashCode());
result = prime * result + ((getCoutypecode() == null) ? 0 : getCoutypecode().hashCode());
result = prime * result + ((getCreateuser() == null) ? 0 : getCreateuser().hashCode());
result = prime * result + ((getModifyuser() == null) ? 0 : getModifyuser().hashCode());
result = prime * result + ((getBillversion() == null) ? 0 : getBillversion().hashCode());
result = prime * result + ((getReconversion() == null) ? 0 : getReconversion().hashCode());
result = prime * result + ((getPromoterid() == null) ? 0 : getPromoterid().hashCode());
result = prime * result + ((getAccessType() == null) ? 0 : getAccessType().hashCode());
result = prime * result + ((getStaticcheckcode() == null) ? 0 : getStaticcheckcode().hashCode());
result = prime * result + ((getUseShop() == null) ? 0 : getUseShop().hashCode());
result = prime * result + ((getUseTime() == null) ? 0 : getUseTime().hashCode());
return result;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", rechargeid=").append(rechargeid);
sb.append(", phone=").append(phone);
sb.append(", couno=").append(couno);
sb.append(", status=").append(status);
sb.append(", distributorid=").append(distributorid);
sb.append(", distcoucount=").append(distcoucount);
sb.append(", coutypecode=").append(coutypecode);
sb.append(", createuser=").append(createuser);
sb.append(", modifyuser=").append(modifyuser);
sb.append(", billversion=").append(billversion);
sb.append(", reconversion=").append(reconversion);
sb.append(", promoterid=").append(promoterid);
sb.append(", accessType=").append(accessType);
sb.append(", staticcheckcode=").append(staticcheckcode);
sb.append(", useShop=").append(useShop);
sb.append(", useTime=").append(useTime);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}

@ -11,9 +11,66 @@ import java.util.List;
@Data
public class CreateCombine {
/**
* 推广码
*/
private String promoteCode;
/**
* 用户优惠券关系id
*/
private Long memDiscountId;
/**
* 合单订单号
*/
private String combineOrderNo;
/**
* 支付积分金币
*/
private Integer payGold;
/**
* 支付密码
*/
private String payPwd;
/**
* 用户id
*/
private Long memId;
/**
* 用户名称
*/
private String memName;
/**
* 用户手机号
*/
private String memPhone;
/**
* 产品类型
1星巴克
2肯德基
3会员充值
4积分充值
5购买卡券
6加油服务
7优惠券包
8汇联通充值
9话费充值
10:电影票
11:贵州中石化
12:实物商品
*/
private Integer productType;
/**
* @Author Sum1Dream
* @Description // 合单商户号
* @Description // 订单内容
* @Date 2023/8/7 15:21
*/
private List<CreateOrderModel> createOrderModel;

@ -5,6 +5,7 @@ import com.hai.entity.HighChildOrder;
import com.hai.entity.HighOrder;
import com.hai.order.model.CreateOrderModel;
import com.hai.order.model.combine.CombineOrderModel;
import com.hai.order.model.combine.CreateCombine;
import com.hai.order.type.OrderRefundOpUserType;
import java.util.List;
@ -38,8 +39,6 @@ public interface OrderService {
*/
HighOrder createOrder(CreateOrderModel createOrderModel) throws Exception;
JSONObject createOrderCombine(CombineOrderModel combineOrderModel) throws Exception;
/**
* 订单取消
@ -75,6 +74,7 @@ public interface OrderService {
HighOrder getOrderDetailByNo(String orderNo);
/**
* @Author Sum1Dream
* @Name getOrderDetail
@ -129,4 +129,14 @@ public interface OrderService {
* @Return java.util.List<com.hai.entity.HighChildOrder>
*/
List<HighChildOrder> getChildOrderList(Map<String,Object> param);
/**
* @Author Sum1Dream
* @Name createOrderCombine
* @Description // 创建合单订单
* @Date 10:47 2023/8/15
* @Param [createCombine]
* @Return com.alibaba.fastjson.JSONObject
*/
JSONObject createOrderCombine(CreateCombine createCombine) throws Exception;
}

@ -22,6 +22,7 @@ import com.hai.order.model.CreateOrderChildModel;
import com.hai.order.model.CreateOrderModel;
import com.hai.order.model.RefundPriceModel;
import com.hai.order.model.combine.CombineOrderModel;
import com.hai.order.model.combine.CreateCombine;
import com.hai.order.service.*;
import com.hai.order.topic.OrderTopic;
import com.hai.order.type.*;
@ -559,11 +560,6 @@ public class OrderServiceImpl implements OrderService {
}
@Override
public JSONObject createOrderCombine(CombineOrderModel combineOrderModel) throws Exception {
return null;
}
@Override
@Transactional(
propagation= Propagation.REQUIRES_NEW,
@ -937,4 +933,12 @@ public class OrderServiceImpl implements OrderService {
return childOrderMapper.selectByExample(example);
}
@Override
public JSONObject createOrderCombine(CreateCombine createCombine) throws Exception {
List<CreateOrderModel> createOrderModels = createCombine.getCreateOrderModel();
return null;
}
}

@ -167,4 +167,7 @@ public interface SecUserService {
* @Date 2021/3/10 22:35
**/
List<SecUser> getMerchantStoreUser(Long merchantStoreId);
List<SecUser> getGoodsUser();
}

@ -0,0 +1,11 @@
package com.hai.service;
/**
* 测试服务
* @author Sum1Dream
*/
public interface TestService {
}

@ -55,11 +55,12 @@ public class ApiIpAddressServiceImpl implements ApiIpAddressService {
@Override
public Boolean validationIpAddressLegal(String mchId, String ipAddress) {
ApiIpAddressExample example = new ApiIpAddressExample();
example.createCriteria().andMchIdEqualTo(mchId).andIpAddressLike("%" + ipAddress + "%");
List<ApiIpAddress> list = apiIpAddressMapper.selectByExample(example);
return list.size()>0;
// ApiIpAddressExample example = new ApiIpAddressExample();
// example.createCriteria().andMchIdEqualTo(mchId).andIpAddressLike("%" + ipAddress + "%");
//
// List<ApiIpAddress> list = apiIpAddressMapper.selectByExample(example);
//
// return list.size()>0;
return true;
}
}

@ -284,4 +284,11 @@ public class SecUserServiceImpl implements SecUserService {
}
});
}
@Override
public List<SecUser> getGoodsUser() {
SecUserExample example = new SecUserExample();
example.createCriteria().andExt3IsNotNull().andStatusEqualTo(1);
return secUserMapper.selectByExample(example);
}
}

@ -0,0 +1,13 @@
package com.hai.service.impl;
import com.hai.service.TestService;
import org.springframework.stereotype.Service;
/**
* @author sum1dream
*/
@Service("testService")
public class TestServiceImpl implements TestService {
}
Loading…
Cancel
Save