master
胡锐 6 months ago
commit 95bb36ed7c
  1. 5
      bweb/src/main/java/com/bweb/controller/cms/CmsContentController.java
  2. 129
      bweb/src/main/java/com/bweb/controller/mer/BsMerController.java
  3. 133
      service/src/main/java/com/hfkj/dao/BsMerPayConfigMapper.java
  4. 7
      service/src/main/java/com/hfkj/dao/BsMerPayConfigMapperExt.java
  5. 360
      service/src/main/java/com/hfkj/dao/BsMerPayConfigSqlProvider.java
  6. 264
      service/src/main/java/com/hfkj/entity/BsMerPayConfig.java
  7. 1143
      service/src/main/java/com/hfkj/entity/BsMerPayConfigExample.java
  8. 79
      service/src/main/java/com/hfkj/mer/BsMerPayConfigService.java
  9. 90
      service/src/main/java/com/hfkj/mer/impl/BsMerPayConfigServiceImpl.java
  10. 1
      service/src/main/java/com/hfkj/service/BsMerService.java
  11. 2
      service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java
  12. 9
      service/src/main/java/com/hfkj/service/goods/impl/GoodsMsgServiceImpl.java
  13. 4
      service/src/main/java/com/hfkj/service/goods/impl/GoodsSpecsServiceImpl.java
  14. 2
      service/src/main/java/com/hfkj/service/hlt/HuiLianTongUnionCardService.java
  15. 5
      service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java
  16. 29
      service/src/main/java/com/hfkj/sysenum/mer/PayPlatformEnum.java

@ -1,12 +1,7 @@
package com.bweb.controller.cms;
import com.bweb.controller.BsMerController;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hfkj.common.security.UserCenter;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.model.ResponseData;
import com.hfkj.service.BsMerService;
import com.hfkj.service.cms.CmsContentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

@ -1,4 +1,4 @@
package com.bweb.controller;
package com.bweb.controller.mer;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
@ -6,12 +6,20 @@ import com.github.pagehelper.PageInfo;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.security.SessionObject;
import com.hfkj.common.security.UserCenter;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.BsMer;
import com.hfkj.entity.BsMerPayConfig;
import com.hfkj.entity.GoodsMsg;
import com.hfkj.entity.GoodsType;
import com.hfkj.mer.BsMerPayConfigService;
import com.hfkj.model.BsMerModel;
import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject;
import com.hfkj.service.BsMerService;
import com.hfkj.sysenum.SecUserObjectTypeEnum;
import com.hfkj.sysenum.mer.PayPlatformEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
@ -21,7 +29,10 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@ -33,12 +44,16 @@ import java.util.Map;
@RequestMapping(value="/mer")
@Api(value="商户业务")
public class BsMerController {
Logger log = LoggerFactory.getLogger(BsMerController.class);
@Resource
private UserCenter userCenter;
@Resource
private BsMerService merService;
@Resource
private BsMerPayConfigService bsMerPayConfigService;
@RequestMapping(value="/create",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "创建商户")
@ -170,4 +185,116 @@ public class BsMerController {
}
@RequestMapping(value="/editPayConfig",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "创建商户支付内容")
public ResponseData editPayConfig(@RequestBody BsMerPayConfig body, HttpServletRequest request) {
try {
SessionObject sessionObject = userCenter.getSessionObject(request);
SecUserSessionObject userModel = (SecUserSessionObject) sessionObject.getObject();
if (userModel.getAccount().getObjectType() != SecUserObjectTypeEnum.type2.getCode()) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, "");
}
if (body == null
|| body.getMerId() == null
|| body.getPayPlatform() == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
if (body.getPayPlatform() == PayPlatformEnum.type1.getCode()) {
if ( body.getPayMerNo() == null
|| body.getPayMerKey() == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
} else if (body.getPayPlatform() == PayPlatformEnum.type2.getCode()) {
if ( body.getHltMerNo() == null
|| body.getHltInstCode() == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
}
BsMerPayConfig merPayConfig;
if (body.getId() != null) {
merPayConfig = bsMerPayConfigService.queryDetail(body.getId());
if (merPayConfig == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.CONTENT_NOT_FOUND, "");
}
} else {
merPayConfig = new BsMerPayConfig();
merPayConfig.setCreateTime(new Date());
}
BsMer bsMer = merService.getDetailById(body.getMerId());
merPayConfig.setUpdateTime(new Date());
merPayConfig.setMerId(body.getMerId());
merPayConfig.setMerNo(bsMer.getMerNo());
merPayConfig.setPayPlatform(body.getPayPlatform());
merPayConfig.setPayMerNo(body.getPayMerNo());
merPayConfig.setPayMerKey(body.getPayMerKey());
merPayConfig.setHltMerNo(body.getHltMerNo());
merPayConfig.setHltInstCode(body.getHltInstCode());
merPayConfig.setStatus(1);
if (body.getId() != null) {
bsMerPayConfigService.update(merPayConfig);
} else {
bsMerPayConfigService.create(merPayConfig);
}
return ResponseMsgUtil.success("操作成功");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/queryMerPayConfig",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询商户支付参数")
public ResponseData queryMerPayConfig(@RequestParam(value = "merNo" , required = true) String merNo) {
try {
Map<String,Object> param = new HashMap<>();
param.put("merNo", merNo);
return ResponseMsgUtil.success(bsMerPayConfigService.getList(param));
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/delete",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "删除")
public ResponseData delete(@RequestParam(value = "id" , required = false) Long id) {
try {
bsMerPayConfigService.delete(id , false);
return ResponseMsgUtil.success("删除成功");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -0,0 +1,133 @@
package com.hfkj.dao;
import com.hfkj.entity.BsMerPayConfig;
import com.hfkj.entity.BsMerPayConfigExample;
import java.util.List;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.DeleteProvider;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Options;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.annotations.Update;
import org.apache.ibatis.annotations.UpdateProvider;
import org.apache.ibatis.type.JdbcType;
import org.springframework.stereotype.Repository;
/**
*
* 代码由工具生成,请勿修改!!!
* 如果需要扩展请在其父类进行扩展
*
**/
@Repository
public interface BsMerPayConfigMapper extends BsMerPayConfigMapperExt {
@SelectProvider(type=BsMerPayConfigSqlProvider.class, method="countByExample")
long countByExample(BsMerPayConfigExample example);
@DeleteProvider(type=BsMerPayConfigSqlProvider.class, method="deleteByExample")
int deleteByExample(BsMerPayConfigExample example);
@Delete({
"delete from bs_mer_pay_config",
"where id = #{id,jdbcType=BIGINT}"
})
int deleteByPrimaryKey(Long id);
@Insert({
"insert into bs_mer_pay_config (mer_id, mer_no, ",
"pay_platform, pay_mer_no, ",
"pay_mer_key, hlt_inst_code, ",
"hlt_mer_no, `status`, ",
"create_time, update_time, ",
"ext_1, ext_2, ext_3)",
"values (#{merId,jdbcType=BIGINT}, #{merNo,jdbcType=VARCHAR}, ",
"#{payPlatform,jdbcType=INTEGER}, #{payMerNo,jdbcType=VARCHAR}, ",
"#{payMerKey,jdbcType=VARCHAR}, #{hltInstCode,jdbcType=VARCHAR}, ",
"#{hltMerNo,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(BsMerPayConfig record);
@InsertProvider(type=BsMerPayConfigSqlProvider.class, method="insertSelective")
@Options(useGeneratedKeys=true,keyProperty="id")
int insertSelective(BsMerPayConfig record);
@SelectProvider(type=BsMerPayConfigSqlProvider.class, method="selectByExample")
@Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT),
@Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR),
@Result(column="pay_platform", property="payPlatform", jdbcType=JdbcType.INTEGER),
@Result(column="pay_mer_no", property="payMerNo", jdbcType=JdbcType.VARCHAR),
@Result(column="pay_mer_key", property="payMerKey", jdbcType=JdbcType.VARCHAR),
@Result(column="hlt_inst_code", property="hltInstCode", jdbcType=JdbcType.VARCHAR),
@Result(column="hlt_mer_no", property="hltMerNo", 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),
@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)
})
List<BsMerPayConfig> selectByExample(BsMerPayConfigExample example);
@Select({
"select",
"id, mer_id, mer_no, pay_platform, pay_mer_no, pay_mer_key, hlt_inst_code, hlt_mer_no, ",
"`status`, create_time, update_time, ext_1, ext_2, ext_3",
"from bs_mer_pay_config",
"where id = #{id,jdbcType=BIGINT}"
})
@Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT),
@Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR),
@Result(column="pay_platform", property="payPlatform", jdbcType=JdbcType.INTEGER),
@Result(column="pay_mer_no", property="payMerNo", jdbcType=JdbcType.VARCHAR),
@Result(column="pay_mer_key", property="payMerKey", jdbcType=JdbcType.VARCHAR),
@Result(column="hlt_inst_code", property="hltInstCode", jdbcType=JdbcType.VARCHAR),
@Result(column="hlt_mer_no", property="hltMerNo", 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),
@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)
})
BsMerPayConfig selectByPrimaryKey(Long id);
@UpdateProvider(type=BsMerPayConfigSqlProvider.class, method="updateByExampleSelective")
int updateByExampleSelective(@Param("record") BsMerPayConfig record, @Param("example") BsMerPayConfigExample example);
@UpdateProvider(type=BsMerPayConfigSqlProvider.class, method="updateByExample")
int updateByExample(@Param("record") BsMerPayConfig record, @Param("example") BsMerPayConfigExample example);
@UpdateProvider(type=BsMerPayConfigSqlProvider.class, method="updateByPrimaryKeySelective")
int updateByPrimaryKeySelective(BsMerPayConfig record);
@Update({
"update bs_mer_pay_config",
"set mer_id = #{merId,jdbcType=BIGINT},",
"mer_no = #{merNo,jdbcType=VARCHAR},",
"pay_platform = #{payPlatform,jdbcType=INTEGER},",
"pay_mer_no = #{payMerNo,jdbcType=VARCHAR},",
"pay_mer_key = #{payMerKey,jdbcType=VARCHAR},",
"hlt_inst_code = #{hltInstCode,jdbcType=VARCHAR},",
"hlt_mer_no = #{hltMerNo,jdbcType=VARCHAR},",
"`status` = #{status,jdbcType=INTEGER},",
"create_time = #{createTime,jdbcType=TIMESTAMP},",
"update_time = #{updateTime,jdbcType=TIMESTAMP},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",
"ext_2 = #{ext2,jdbcType=VARCHAR},",
"ext_3 = #{ext3,jdbcType=VARCHAR}",
"where id = #{id,jdbcType=BIGINT}"
})
int updateByPrimaryKey(BsMerPayConfig record);
}

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

@ -0,0 +1,360 @@
package com.hfkj.dao;
import com.hfkj.entity.BsMerPayConfig;
import com.hfkj.entity.BsMerPayConfigExample.Criteria;
import com.hfkj.entity.BsMerPayConfigExample.Criterion;
import com.hfkj.entity.BsMerPayConfigExample;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.jdbc.SQL;
public class BsMerPayConfigSqlProvider {
public String countByExample(BsMerPayConfigExample example) {
SQL sql = new SQL();
sql.SELECT("count(*)").FROM("bs_mer_pay_config");
applyWhere(sql, example, false);
return sql.toString();
}
public String deleteByExample(BsMerPayConfigExample example) {
SQL sql = new SQL();
sql.DELETE_FROM("bs_mer_pay_config");
applyWhere(sql, example, false);
return sql.toString();
}
public String insertSelective(BsMerPayConfig record) {
SQL sql = new SQL();
sql.INSERT_INTO("bs_mer_pay_config");
if (record.getMerId() != null) {
sql.VALUES("mer_id", "#{merId,jdbcType=BIGINT}");
}
if (record.getMerNo() != null) {
sql.VALUES("mer_no", "#{merNo,jdbcType=VARCHAR}");
}
if (record.getPayPlatform() != null) {
sql.VALUES("pay_platform", "#{payPlatform,jdbcType=INTEGER}");
}
if (record.getPayMerNo() != null) {
sql.VALUES("pay_mer_no", "#{payMerNo,jdbcType=VARCHAR}");
}
if (record.getPayMerKey() != null) {
sql.VALUES("pay_mer_key", "#{payMerKey,jdbcType=VARCHAR}");
}
if (record.getHltInstCode() != null) {
sql.VALUES("hlt_inst_code", "#{hltInstCode,jdbcType=VARCHAR}");
}
if (record.getHltMerNo() != null) {
sql.VALUES("hlt_mer_no", "#{hltMerNo,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
}
if (record.getCreateTime() != null) {
sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
}
if (record.getUpdateTime() != null) {
sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
}
if (record.getExt1() != null) {
sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
}
if (record.getExt2() != null) {
sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}");
}
if (record.getExt3() != null) {
sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}");
}
return sql.toString();
}
public String selectByExample(BsMerPayConfigExample example) {
SQL sql = new SQL();
if (example != null && example.isDistinct()) {
sql.SELECT_DISTINCT("id");
} else {
sql.SELECT("id");
}
sql.SELECT("mer_id");
sql.SELECT("mer_no");
sql.SELECT("pay_platform");
sql.SELECT("pay_mer_no");
sql.SELECT("pay_mer_key");
sql.SELECT("hlt_inst_code");
sql.SELECT("hlt_mer_no");
sql.SELECT("`status`");
sql.SELECT("create_time");
sql.SELECT("update_time");
sql.SELECT("ext_1");
sql.SELECT("ext_2");
sql.SELECT("ext_3");
sql.FROM("bs_mer_pay_config");
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) {
BsMerPayConfig record = (BsMerPayConfig) parameter.get("record");
BsMerPayConfigExample example = (BsMerPayConfigExample) parameter.get("example");
SQL sql = new SQL();
sql.UPDATE("bs_mer_pay_config");
if (record.getId() != null) {
sql.SET("id = #{record.id,jdbcType=BIGINT}");
}
if (record.getMerId() != null) {
sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}");
}
if (record.getMerNo() != null) {
sql.SET("mer_no = #{record.merNo,jdbcType=VARCHAR}");
}
if (record.getPayPlatform() != null) {
sql.SET("pay_platform = #{record.payPlatform,jdbcType=INTEGER}");
}
if (record.getPayMerNo() != null) {
sql.SET("pay_mer_no = #{record.payMerNo,jdbcType=VARCHAR}");
}
if (record.getPayMerKey() != null) {
sql.SET("pay_mer_key = #{record.payMerKey,jdbcType=VARCHAR}");
}
if (record.getHltInstCode() != null) {
sql.SET("hlt_inst_code = #{record.hltInstCode,jdbcType=VARCHAR}");
}
if (record.getHltMerNo() != null) {
sql.SET("hlt_mer_no = #{record.hltMerNo,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
}
if (record.getCreateTime() != null) {
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
}
if (record.getUpdateTime() != null) {
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
}
if (record.getExt2() != null) {
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
}
if (record.getExt3() != null) {
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
}
applyWhere(sql, example, true);
return sql.toString();
}
public String updateByExample(Map<String, Object> parameter) {
SQL sql = new SQL();
sql.UPDATE("bs_mer_pay_config");
sql.SET("id = #{record.id,jdbcType=BIGINT}");
sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}");
sql.SET("mer_no = #{record.merNo,jdbcType=VARCHAR}");
sql.SET("pay_platform = #{record.payPlatform,jdbcType=INTEGER}");
sql.SET("pay_mer_no = #{record.payMerNo,jdbcType=VARCHAR}");
sql.SET("pay_mer_key = #{record.payMerKey,jdbcType=VARCHAR}");
sql.SET("hlt_inst_code = #{record.hltInstCode,jdbcType=VARCHAR}");
sql.SET("hlt_mer_no = #{record.hltMerNo,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}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
BsMerPayConfigExample example = (BsMerPayConfigExample) parameter.get("example");
applyWhere(sql, example, true);
return sql.toString();
}
public String updateByPrimaryKeySelective(BsMerPayConfig record) {
SQL sql = new SQL();
sql.UPDATE("bs_mer_pay_config");
if (record.getMerId() != null) {
sql.SET("mer_id = #{merId,jdbcType=BIGINT}");
}
if (record.getMerNo() != null) {
sql.SET("mer_no = #{merNo,jdbcType=VARCHAR}");
}
if (record.getPayPlatform() != null) {
sql.SET("pay_platform = #{payPlatform,jdbcType=INTEGER}");
}
if (record.getPayMerNo() != null) {
sql.SET("pay_mer_no = #{payMerNo,jdbcType=VARCHAR}");
}
if (record.getPayMerKey() != null) {
sql.SET("pay_mer_key = #{payMerKey,jdbcType=VARCHAR}");
}
if (record.getHltInstCode() != null) {
sql.SET("hlt_inst_code = #{hltInstCode,jdbcType=VARCHAR}");
}
if (record.getHltMerNo() != null) {
sql.SET("hlt_mer_no = #{hltMerNo,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{status,jdbcType=INTEGER}");
}
if (record.getCreateTime() != null) {
sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
}
if (record.getUpdateTime() != null) {
sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
}
if (record.getExt2() != null) {
sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}");
}
if (record.getExt3() != null) {
sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}");
}
sql.WHERE("id = #{id,jdbcType=BIGINT}");
return sql.toString();
}
protected void applyWhere(SQL sql, BsMerPayConfigExample 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());
}
}
}

@ -0,0 +1,264 @@
package com.hfkj.entity;
import java.io.Serializable;
import java.util.Date;
/**
* bs_mer_pay_config
* @author
*/
/**
*
* 代码由工具生成
*
**/
public class BsMerPayConfig implements Serializable {
/**
* 主键
*/
private Long id;
/**
* 商户id
*/
private Long merId;
/**
* 商户号
*/
private String merNo;
/**
* 支付平台
*/
private Integer payPlatform;
/**
* 支付商户号
*/
private String payMerNo;
/**
* 支付商户key
*/
private String payMerKey;
/**
* 汇联通终端号
*/
private String hltInstCode;
/**
* 汇联通商户号
*/
private String hltMerNo;
/**
* 状态 0不可用 1正常
*/
private Integer status;
/**
* 创建时间
*/
private Date createTime;
/**
* 修改时间
*/
private Date updateTime;
private String ext1;
private String ext2;
private String ext3;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getMerId() {
return merId;
}
public void setMerId(Long merId) {
this.merId = merId;
}
public String getMerNo() {
return merNo;
}
public void setMerNo(String merNo) {
this.merNo = merNo;
}
public Integer getPayPlatform() {
return payPlatform;
}
public void setPayPlatform(Integer payPlatform) {
this.payPlatform = payPlatform;
}
public String getPayMerNo() {
return payMerNo;
}
public void setPayMerNo(String payMerNo) {
this.payMerNo = payMerNo;
}
public String getPayMerKey() {
return payMerKey;
}
public void setPayMerKey(String payMerKey) {
this.payMerKey = payMerKey;
}
public String getHltInstCode() {
return hltInstCode;
}
public void setHltInstCode(String hltInstCode) {
this.hltInstCode = hltInstCode;
}
public String getHltMerNo() {
return hltMerNo;
}
public void setHltMerNo(String hltMerNo) {
this.hltMerNo = hltMerNo;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getExt1() {
return ext1;
}
public void setExt1(String ext1) {
this.ext1 = ext1;
}
public String getExt2() {
return ext2;
}
public void setExt2(String ext2) {
this.ext2 = ext2;
}
public String getExt3() {
return ext3;
}
public void setExt3(String ext3) {
this.ext3 = ext3;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
BsMerPayConfig other = (BsMerPayConfig) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId()))
&& (this.getMerNo() == null ? other.getMerNo() == null : this.getMerNo().equals(other.getMerNo()))
&& (this.getPayPlatform() == null ? other.getPayPlatform() == null : this.getPayPlatform().equals(other.getPayPlatform()))
&& (this.getPayMerNo() == null ? other.getPayMerNo() == null : this.getPayMerNo().equals(other.getPayMerNo()))
&& (this.getPayMerKey() == null ? other.getPayMerKey() == null : this.getPayMerKey().equals(other.getPayMerKey()))
&& (this.getHltInstCode() == null ? other.getHltInstCode() == null : this.getHltInstCode().equals(other.getHltInstCode()))
&& (this.getHltMerNo() == null ? other.getHltMerNo() == null : this.getHltMerNo().equals(other.getHltMerNo()))
&& (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()))
&& (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()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getMerId() == null) ? 0 : getMerId().hashCode());
result = prime * result + ((getMerNo() == null) ? 0 : getMerNo().hashCode());
result = prime * result + ((getPayPlatform() == null) ? 0 : getPayPlatform().hashCode());
result = prime * result + ((getPayMerNo() == null) ? 0 : getPayMerNo().hashCode());
result = prime * result + ((getPayMerKey() == null) ? 0 : getPayMerKey().hashCode());
result = prime * result + ((getHltInstCode() == null) ? 0 : getHltInstCode().hashCode());
result = prime * result + ((getHltMerNo() == null) ? 0 : getHltMerNo().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());
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
result = prime * result + ((getExt3() == null) ? 0 : getExt3().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(", merId=").append(merId);
sb.append(", merNo=").append(merNo);
sb.append(", payPlatform=").append(payPlatform);
sb.append(", payMerNo=").append(payMerNo);
sb.append(", payMerKey=").append(payMerKey);
sb.append(", hltInstCode=").append(hltInstCode);
sb.append(", hltMerNo=").append(hltMerNo);
sb.append(", status=").append(status);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", ext1=").append(ext1);
sb.append(", ext2=").append(ext2);
sb.append(", ext3=").append(ext3);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}

@ -0,0 +1,79 @@
package com.hfkj.mer;
import com.hfkj.entity.BsMerPayConfig;
import java.util.List;
import java.util.Map;
public interface BsMerPayConfigService {
/**
* @Author Sum1Dream
* @Name create
* @Description // 创建
* @Date 15:11 2024/4/19
* @Param GoodsBrand
* @return void
*/
void create(BsMerPayConfig merPayConfig);
/**
* @Author Sum1Dream
* @Name update
* @Description // 修改
* @Date 15:12 2024/4/19
* @Param GoodsBrand
* @return void
*/
void update(BsMerPayConfig merPayConfig);
/**
* @Author Sum1Dream
* @Name delete
* @Description // 修改
* @Date 15:12 2024/4/19
* @Param id
* @return void
*/
void delete(Long id , Boolean fullDelete);
/**
* @Author Sum1Dream
* @Name queryDetail
* @Description // 根据ID查询产品类型详情
* @Date 15:12 2024/4/19
* @Param id
* @return com.hfkj.entity.GoodsBrand
*/
BsMerPayConfig queryDetail(Long id);
/**
* @Author Sum1Dream
* @Name findGoodsOrder
* @Description // 查询详情
* @Date 15:44 2023/4/20
* @Param [orderNo]
* @Return com.hai.entity.GoodsOrder
*/
BsMerPayConfig findGoodsOrder(Long merId);
/**
* @Author Sum1Dream
* @Name queryDetailByMap
* @Description // 根据多条件查询产品类型
* @Date 15:12 2024/4/19
* @Param map
* @return com.hfkj.entity.GoodsBrand
*/
BsMerPayConfig queryDetailByMap(Map<String , Object> map);
/**
* @Author Sum1Dream
* @Name getList
* @Description // 根据多条件查询列表
* @Date 15:13 2024/4/19
* @Param map
* @return java.util.List<com.hfkj.entity.GoodsBrand>
*/
List<BsMerPayConfig> getList(Map<String , Object> map);
}

@ -0,0 +1,90 @@
package com.hfkj.mer.impl;
import com.hfkj.dao.BsMerPayConfigMapper;
import com.hfkj.entity.BsMerPayConfig;
import com.hfkj.entity.BsMerPayConfigExample;
import com.hfkj.entity.GoodsMsg;
import com.hfkj.mer.BsMerPayConfigService;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service("BsMerPayConfigService")
public class BsMerPayConfigServiceImpl implements BsMerPayConfigService {
@Resource
private BsMerPayConfigMapper bsMerPayConfigMapper;
@Override
public void create(BsMerPayConfig merPayConfig) {
bsMerPayConfigMapper.insert(merPayConfig);
}
@Override
public void update(BsMerPayConfig merPayConfig) {
bsMerPayConfigMapper.updateByPrimaryKeySelective(merPayConfig);
}
@Override
public void delete(Long id, Boolean fullDelete) {
if (fullDelete) {
bsMerPayConfigMapper.deleteByPrimaryKey(id);
} else {
BsMerPayConfig merPayConfig = queryDetail(id);
merPayConfig.setStatus(0);
merPayConfig.setUpdateTime(new Date());
update(merPayConfig);
}
}
@Override
public BsMerPayConfig queryDetail(Long id) {
return bsMerPayConfigMapper.selectByPrimaryKey(id);
}
@Override
public BsMerPayConfig findGoodsOrder(Long merId) {
BsMerPayConfigExample example = new BsMerPayConfigExample();
BsMerPayConfigExample.Criteria criteria = example.createCriteria();
criteria.andMerIdEqualTo(merId);
List<BsMerPayConfig> list = bsMerPayConfigMapper.selectByExample(example);
if (list != null && !list.isEmpty()) {
return list.get(0);
}
return null;
}
@Override
public BsMerPayConfig queryDetailByMap(Map<String, Object> map) {
BsMerPayConfigExample example = new BsMerPayConfigExample();
BsMerPayConfigExample.Criteria criteria = example.createCriteria();
if (MapUtils.getLong(map, "merId") != null) {
criteria.andMerIdEqualTo(MapUtils.getLong(map, "merId"));
}
if (MapUtils.getLong(map, "payPlatform") != null) {
criteria.andMerIdEqualTo(MapUtils.getLong(map, "payPlatform"));
}
criteria.andStatusEqualTo(1);
List<BsMerPayConfig> list = bsMerPayConfigMapper.selectByExample(example);
if (list != null && !list.isEmpty()) {
return list.get(0);
}
return null;
}
@Override
public List<BsMerPayConfig> getList(Map<String, Object> map) {
return Collections.emptyList();
}
}

@ -44,6 +44,7 @@ public interface BsMerService {
* @return
*/
BsMerModel getDetail(String merNo);
BsMer getDetailById(Long id);
/**
* 查询商户列表

@ -142,7 +142,7 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService {
} else {
criteria.andStatusNotEqualTo(0);
}
example.setOrderByClause("create_time desc");
return bsOrderGoodsMapper.selectByExample(example);
}

@ -107,13 +107,13 @@ public class GoodsMsgServiceImpl implements GoodsMsgService {
public void editSaleNum(Long goodsId, Integer num , Integer type) {
String key = "GOODS" + goodsId;
// 分布式锁占坑
Boolean lock = redisTemplate.opsForValue().setIfAbsent(key, goodsId);
try {
// 分布式锁占坑
Boolean lock = redisTemplate.opsForValue().setIfAbsent(key, goodsId);
System.out.println("==========================================================lock" + lock);
GoodsMsg goodsMsg = queryDetail(goodsId);
System.out.println("==========================================================goodsMsg" + goodsMsg);
if (goodsMsg != null) {
if(Boolean.TRUE.equals(lock)) {
@ -126,7 +126,6 @@ public class GoodsMsgServiceImpl implements GoodsMsgService {
update(goodsMsg);
} else {
System.out.println("==========================================================加锁失败,重试");
// 加锁失败,重试
Thread.sleep(100);
editSaleNum(goodsId , num , type);

@ -102,10 +102,10 @@ public class GoodsSpecsServiceImpl implements GoodsSpecsService {
String key = "GOODS_STOCK_NUM";
GoodsSpecs goodsSpecs = queryDetailByGoodsId(specsId);
// 分布式锁占坑
Boolean lock = redisTemplate.opsForValue().setIfAbsent(key, specsId);
try {
// 分布式锁占坑
Boolean lock = redisTemplate.opsForValue().setIfAbsent(key, specsId);
if(Boolean.TRUE.equals(lock)) {

@ -174,7 +174,7 @@ public class HuiLianTongUnionCardService {
map.put("accessCode", HLT_CARD_ACCESS_CODE);
map.put("requestId", System.currentTimeMillis());
map.put("method", method);
log.info("加密前: " + JSON.toJSONString(param));
// DES加密
map.put("data", DesUtil.encode(JSONObject.toJSONString(param), Charset.forName("UTF-8"),signCode).replace("\\n", ""));

@ -174,6 +174,11 @@ public class BsMerServiceImpl implements BsMerService {
return null;
}
@Override
public BsMer getDetailById(Long id) {
return merMapper.selectByPrimaryKey(id);
}
@Override
public List<BsMer> getList(Map<String, Object> param) {
BsMerExample example = new BsMerExample();

@ -0,0 +1,29 @@
package com.hfkj.sysenum.mer;
import lombok.Getter;
@Getter
public enum PayPlatformEnum {
/**
* 菜单
*/
type1(1, "惠支付"),
/**
* 按钮
*/
type2(2, "工会卡"),
;
private int code;
private String name;
PayPlatformEnum(int code, String name) {
this.code = code;
this.name = name;
}
}
Loading…
Cancel
Save