Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev

new-dev
胡锐 1 year ago
commit 124f0945c9
  1. 2
      hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
  2. 4
      hai-bweb/src/main/resources/dev/config.properties
  3. 7
      hai-cweb/src/main/java/com/cweb/controller/BsMsgController.java
  4. 3
      hai-cweb/src/main/java/com/cweb/controller/HighMerchantStoreController.java
  5. 2
      hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java
  6. 44
      hai-order/src/main/java/com/web/controller/business/OrderStatisticController.java
  7. 2
      hai-service/src/main/java/com/hai/config/ThirdProductConfig.java
  8. 20
      hai-service/src/main/java/com/hai/dao/BsPushScheduldTaskMapper.java
  9. 10
      hai-service/src/main/java/com/hai/dao/BsPushScheduldTaskSqlProvider.java
  10. 8
      hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
  11. 2
      hai-service/src/main/java/com/hai/dao/SecSinopecConfigMapper.java
  12. 177
      hai-service/src/main/java/com/hai/entity/ApiIpAddress.java
  13. 753
      hai-service/src/main/java/com/hai/entity/ApiIpAddressExample.java
  14. 2
      hai-service/src/main/java/com/hai/entity/ApiStarbucksProductsExample.java
  15. 6
      hai-service/src/main/java/com/hai/entity/BsPushScheduleTask.java
  16. 14
      hai-service/src/main/java/com/hai/mobile/service/MobileHandleService.java
  17. 6
      hai-service/src/main/java/com/hai/mobile/service/impl/MobileHandleServiceImpl.java
  18. 5
      hai-service/src/main/java/com/hai/service/BsConfigService.java
  19. 62
      hai-service/src/main/java/com/hai/service/BsPushScheduleTaskService.java
  20. 11
      hai-service/src/main/java/com/hai/service/HighOrderService.java
  21. 1
      hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java
  22. 51
      hai-service/src/main/java/com/hai/service/impl/BsConfigServiceImpl.java
  23. 35
      hai-service/src/main/java/com/hai/service/impl/BsPushScheduleTaskServiceImpl.java
  24. 5
      hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
  25. 6
      hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
  26. 2
      hai-service/src/main/resources/dev/commonConfig.properties
  27. 2
      hai-user/src/main/java/com/web/controller/LoginController.java
  28. 1
      v1/src/main/java/com/v1/config/AuthConfig.java
  29. 10
      v1/src/main/java/com/v1/config/SysConfig.java
  30. 89
      v1/src/main/java/com/v1/controller/business/FileUploadController.java
  31. 2
      v1/src/main/resources/dev/config.properties
  32. 7
      v1/src/main/resources/pre/config.properties
  33. 2
      v1/src/main/resources/prod/config.properties

File diff suppressed because one or more lines are too long

@ -1,5 +1,5 @@
#fileUrl=/home/project/hsg/filesystem
fileUrl=/Volumes/work/code/filesystem/
fileUrl=/home/project/hsg/filesystem
#fileUrl=/Volumes/work/code/filesystem/
cmsPath=/home/project/hsg/filesystem/cmsPath
agentQrCode=/home/project/hsg/filesystem/agentQrCode
agentQrCodeWxUrl=https://hsgcs.dctpay.com/wx/?action=ic&id=

@ -1,17 +1,12 @@
package com.cweb.controller;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hai.common.exception.ErrorCode;
import com.hai.common.exception.ErrorHelp;
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.BsMsg;
import com.hai.model.HighUserModel;
import com.hai.model.ResponseData;
import com.hai.model.UserInfoModel;
import com.hai.service.BsMsgService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

@ -41,9 +41,6 @@ public class HighMerchantStoreController {
private static Logger log = LoggerFactory.getLogger(HighMerchantStoreController.class);
@Autowired
private UserCenter userCenter;
@Resource
private HighCouponService highCouponService;

@ -356,7 +356,6 @@ public class HighThirdPartyController {
public ResponseData getThirdOrderByOrderNo(@RequestParam(name = "orderNo", required = true) String orderNo) {
try {
HighOrder order = highOrderService.getOrderByOrderNo(orderNo);
JSONObject object;
@ -365,7 +364,6 @@ public class HighThirdPartyController {
// 实际支付金额
BigDecimal orderPayPrice = new BigDecimal(0);
if (order.getHighChildOrderList().get(0).getGoodsType() == 4) {
object = QianZhuConfig.getKfcOrderByOrderNo(order.getHighChildOrderList().get(0).getChannelOrderNo());

@ -0,0 +1,44 @@
package com.web.controller.business;
import com.alibaba.excel.EasyExcel;
import com.hai.common.utils.ResponseMsgUtil;
import com.hai.model.HighOrderModel;
import com.hai.model.ResponseData;
import com.hai.service.HighOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.util.List;
@Controller
@RequestMapping(value = "orderStatistic")
@Api(value = "订单统计业务")
public class OrderStatisticController {
private static Logger log = LoggerFactory.getLogger(OrderStatisticController.class);
@Resource
private HighOrderService highOrderService;
@RequestMapping(value = "/hltCardNoTopUpStatistic", method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "汇联通工会卡充值统计")
public ResponseData hltCardNoTopUpStatistic() {
try {
return ResponseMsgUtil.success(highOrderService.hltCardNoTopUpStatistic());
} catch (Exception e) {
log.error("HighOrderController --> getUserOrderList() error!", e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -120,7 +120,7 @@ public class ThirdProductConfig {
} else {
object.put("productPayType" , bsConfigService.getProductPayTypeByMap(listMap));
}
object.put("productPayTypeNew" , bsConfigService.getProductPayTypeNewByMap(listMap));
object.put("productPlatform" , bsConfigService.getProductPlatformByMap(listMap));
return object;

@ -1,6 +1,6 @@
package com.hai.dao;
import com.hai.entity.BsPushScheduldTask;
import com.hai.entity.BsPushScheduleTask;
import com.hai.entity.BsPushScheduldTaskExample;
import java.util.List;
import org.apache.ibatis.annotations.Delete;
@ -53,11 +53,11 @@ public interface BsPushScheduldTaskMapper extends BsPushScheduldTaskMapperExt {
"#{ext6,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(BsPushScheduldTask record);
int insert(BsPushScheduleTask record);
@InsertProvider(type=BsPushScheduldTaskSqlProvider.class, method="insertSelective")
@Options(useGeneratedKeys=true,keyProperty="id")
int insertSelective(BsPushScheduldTask record);
int insertSelective(BsPushScheduleTask record);
@SelectProvider(type=BsPushScheduldTaskSqlProvider.class, method="selectByExample")
@Results({
@ -76,7 +76,7 @@ public interface BsPushScheduldTaskMapper extends BsPushScheduldTaskMapperExt {
@Result(column="ext_5", property="ext5", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_6", property="ext6", jdbcType=JdbcType.VARCHAR)
})
List<BsPushScheduldTask> selectByExample(BsPushScheduldTaskExample example);
List<BsPushScheduleTask> selectByExample(BsPushScheduldTaskExample example);
@Select({
"select",
@ -101,16 +101,16 @@ public interface BsPushScheduldTaskMapper extends BsPushScheduldTaskMapperExt {
@Result(column="ext_5", property="ext5", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_6", property="ext6", jdbcType=JdbcType.VARCHAR)
})
BsPushScheduldTask selectByPrimaryKey(Long id);
BsPushScheduleTask selectByPrimaryKey(Long id);
@UpdateProvider(type=BsPushScheduldTaskSqlProvider.class, method="updateByExampleSelective")
int updateByExampleSelective(@Param("record") BsPushScheduldTask record, @Param("example") BsPushScheduldTaskExample example);
int updateByExampleSelective(@Param("record") BsPushScheduleTask record, @Param("example") BsPushScheduldTaskExample example);
@UpdateProvider(type=BsPushScheduldTaskSqlProvider.class, method="updateByExample")
int updateByExample(@Param("record") BsPushScheduldTask record, @Param("example") BsPushScheduldTaskExample example);
int updateByExample(@Param("record") BsPushScheduleTask record, @Param("example") BsPushScheduldTaskExample example);
@UpdateProvider(type=BsPushScheduldTaskSqlProvider.class, method="updateByPrimaryKeySelective")
int updateByPrimaryKeySelective(BsPushScheduldTask record);
int updateByPrimaryKeySelective(BsPushScheduleTask record);
@Update({
"update bs_push_scheduld_task",
@ -129,5 +129,5 @@ public interface BsPushScheduldTaskMapper extends BsPushScheduldTaskMapperExt {
"ext_6 = #{ext6,jdbcType=VARCHAR}",
"where id = #{id,jdbcType=BIGINT}"
})
int updateByPrimaryKey(BsPushScheduldTask record);
}
int updateByPrimaryKey(BsPushScheduleTask record);
}

@ -1,6 +1,6 @@
package com.hai.dao;
import com.hai.entity.BsPushScheduldTask;
import com.hai.entity.BsPushScheduleTask;
import com.hai.entity.BsPushScheduldTaskExample.Criteria;
import com.hai.entity.BsPushScheduldTaskExample.Criterion;
import com.hai.entity.BsPushScheduldTaskExample;
@ -24,7 +24,7 @@ public class BsPushScheduldTaskSqlProvider {
return sql.toString();
}
public String insertSelective(BsPushScheduldTask record) {
public String insertSelective(BsPushScheduleTask record) {
SQL sql = new SQL();
sql.INSERT_INTO("bs_push_scheduld_task");
@ -114,7 +114,7 @@ public class BsPushScheduldTaskSqlProvider {
}
public String updateByExampleSelective(Map<String, Object> parameter) {
BsPushScheduldTask record = (BsPushScheduldTask) parameter.get("record");
BsPushScheduleTask record = (BsPushScheduleTask) parameter.get("record");
BsPushScheduldTaskExample example = (BsPushScheduldTaskExample) parameter.get("example");
SQL sql = new SQL();
@ -204,7 +204,7 @@ public class BsPushScheduldTaskSqlProvider {
return sql.toString();
}
public String updateByPrimaryKeySelective(BsPushScheduldTask record) {
public String updateByPrimaryKeySelective(BsPushScheduleTask record) {
SQL sql = new SQL();
sql.UPDATE("bs_push_scheduld_task");
@ -357,4 +357,4 @@ public class BsPushScheduldTaskSqlProvider {
sql.WHERE(sb.toString());
}
}
}
}

@ -1277,4 +1277,12 @@ public interface HighOrderMapperExt {
@Result(column="ext_6", property="ext6", jdbcType=JdbcType.VARCHAR)
})
List<HighOrder> phoneErrorOrder();
@Select({
"<script> " +
" select SUM(pay_real_price) as sum , count(high_order.id) as count from high_order where order_status in (2 , 3) and product_type =8 and pay_type = 2 and total_price in (50 , 150 ,100 ,200);" +
"</script>"
})
Map<String, Object> HltCardNoTopUpStatistic();
}

@ -102,4 +102,4 @@ public interface SecSinopecConfigMapper extends SecSinopecConfigMapperExt {
"where id = #{id,jdbcType=INTEGER}"
})
int updateByPrimaryKey(SecSinopecConfig record);
}
}

@ -0,0 +1,177 @@
package com.hai.entity;
import java.io.Serializable;
import java.util.Date;
/**
* api_ip_address
* @author
*/
/**
*
* 代码由工具生成
*
**/
public class ApiIpAddress implements Serializable {
/**
* 主键
*/
private Long id;
/**
* ip地址
*/
private String ipAddress;
/**
* 商户号
*/
private String mchId;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* ext_1
*/
private String ext1;
/**
* ext_2
*/
private String ext2;
/**
* ext_3
*/
private String ext3;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getIpAddress() {
return ipAddress;
}
public void setIpAddress(String ipAddress) {
this.ipAddress = ipAddress;
}
public String getMchId() {
return mchId;
}
public void setMchId(String mchId) {
this.mchId = mchId;
}
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;
}
ApiIpAddress other = (ApiIpAddress) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getIpAddress() == null ? other.getIpAddress() == null : this.getIpAddress().equals(other.getIpAddress()))
&& (this.getMchId() == null ? other.getMchId() == null : this.getMchId().equals(other.getMchId()))
&& (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 + ((getIpAddress() == null) ? 0 : getIpAddress().hashCode());
result = prime * result + ((getMchId() == null) ? 0 : getMchId().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(", ipAddress=").append(ipAddress);
sb.append(", mchId=").append(mchId);
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,753 @@
package com.hai.entity;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class ApiIpAddressExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
private Integer limit;
private Long offset;
public ApiIpAddressExample() {
oredCriteria = new ArrayList<Criteria>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
public void setLimit(Integer limit) {
this.limit = limit;
}
public Integer getLimit() {
return limit;
}
public void setOffset(Long offset) {
this.offset = offset;
}
public Long getOffset() {
return offset;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIpAddressIsNull() {
addCriterion("ip_address is null");
return (Criteria) this;
}
public Criteria andIpAddressIsNotNull() {
addCriterion("ip_address is not null");
return (Criteria) this;
}
public Criteria andIpAddressEqualTo(String value) {
addCriterion("ip_address =", value, "ipAddress");
return (Criteria) this;
}
public Criteria andIpAddressNotEqualTo(String value) {
addCriterion("ip_address <>", value, "ipAddress");
return (Criteria) this;
}
public Criteria andIpAddressGreaterThan(String value) {
addCriterion("ip_address >", value, "ipAddress");
return (Criteria) this;
}
public Criteria andIpAddressGreaterThanOrEqualTo(String value) {
addCriterion("ip_address >=", value, "ipAddress");
return (Criteria) this;
}
public Criteria andIpAddressLessThan(String value) {
addCriterion("ip_address <", value, "ipAddress");
return (Criteria) this;
}
public Criteria andIpAddressLessThanOrEqualTo(String value) {
addCriterion("ip_address <=", value, "ipAddress");
return (Criteria) this;
}
public Criteria andIpAddressLike(String value) {
addCriterion("ip_address like", value, "ipAddress");
return (Criteria) this;
}
public Criteria andIpAddressNotLike(String value) {
addCriterion("ip_address not like", value, "ipAddress");
return (Criteria) this;
}
public Criteria andIpAddressIn(List<String> values) {
addCriterion("ip_address in", values, "ipAddress");
return (Criteria) this;
}
public Criteria andIpAddressNotIn(List<String> values) {
addCriterion("ip_address not in", values, "ipAddress");
return (Criteria) this;
}
public Criteria andIpAddressBetween(String value1, String value2) {
addCriterion("ip_address between", value1, value2, "ipAddress");
return (Criteria) this;
}
public Criteria andIpAddressNotBetween(String value1, String value2) {
addCriterion("ip_address not between", value1, value2, "ipAddress");
return (Criteria) this;
}
public Criteria andMchIdIsNull() {
addCriterion("mch_id is null");
return (Criteria) this;
}
public Criteria andMchIdIsNotNull() {
addCriterion("mch_id is not null");
return (Criteria) this;
}
public Criteria andMchIdEqualTo(String value) {
addCriterion("mch_id =", value, "mchId");
return (Criteria) this;
}
public Criteria andMchIdNotEqualTo(String value) {
addCriterion("mch_id <>", value, "mchId");
return (Criteria) this;
}
public Criteria andMchIdGreaterThan(String value) {
addCriterion("mch_id >", value, "mchId");
return (Criteria) this;
}
public Criteria andMchIdGreaterThanOrEqualTo(String value) {
addCriterion("mch_id >=", value, "mchId");
return (Criteria) this;
}
public Criteria andMchIdLessThan(String value) {
addCriterion("mch_id <", value, "mchId");
return (Criteria) this;
}
public Criteria andMchIdLessThanOrEqualTo(String value) {
addCriterion("mch_id <=", value, "mchId");
return (Criteria) this;
}
public Criteria andMchIdLike(String value) {
addCriterion("mch_id like", value, "mchId");
return (Criteria) this;
}
public Criteria andMchIdNotLike(String value) {
addCriterion("mch_id not like", value, "mchId");
return (Criteria) this;
}
public Criteria andMchIdIn(List<String> values) {
addCriterion("mch_id in", values, "mchId");
return (Criteria) this;
}
public Criteria andMchIdNotIn(List<String> values) {
addCriterion("mch_id not in", values, "mchId");
return (Criteria) this;
}
public Criteria andMchIdBetween(String value1, String value2) {
addCriterion("mch_id between", value1, value2, "mchId");
return (Criteria) this;
}
public Criteria andMchIdNotBetween(String value1, String value2) {
addCriterion("mch_id not between", value1, value2, "mchId");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("update_time is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_time is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_time =", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_time >", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_time >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_time <", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_time <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_time not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andExt1IsNull() {
addCriterion("ext_1 is null");
return (Criteria) this;
}
public Criteria andExt1IsNotNull() {
addCriterion("ext_1 is not null");
return (Criteria) this;
}
public Criteria andExt1EqualTo(String value) {
addCriterion("ext_1 =", value, "ext1");
return (Criteria) this;
}
public Criteria andExt1NotEqualTo(String value) {
addCriterion("ext_1 <>", value, "ext1");
return (Criteria) this;
}
public Criteria andExt1GreaterThan(String value) {
addCriterion("ext_1 >", value, "ext1");
return (Criteria) this;
}
public Criteria andExt1GreaterThanOrEqualTo(String value) {
addCriterion("ext_1 >=", value, "ext1");
return (Criteria) this;
}
public Criteria andExt1LessThan(String value) {
addCriterion("ext_1 <", value, "ext1");
return (Criteria) this;
}
public Criteria andExt1LessThanOrEqualTo(String value) {
addCriterion("ext_1 <=", value, "ext1");
return (Criteria) this;
}
public Criteria andExt1Like(String value) {
addCriterion("ext_1 like", value, "ext1");
return (Criteria) this;
}
public Criteria andExt1NotLike(String value) {
addCriterion("ext_1 not like", value, "ext1");
return (Criteria) this;
}
public Criteria andExt1In(List<String> values) {
addCriterion("ext_1 in", values, "ext1");
return (Criteria) this;
}
public Criteria andExt1NotIn(List<String> values) {
addCriterion("ext_1 not in", values, "ext1");
return (Criteria) this;
}
public Criteria andExt1Between(String value1, String value2) {
addCriterion("ext_1 between", value1, value2, "ext1");
return (Criteria) this;
}
public Criteria andExt1NotBetween(String value1, String value2) {
addCriterion("ext_1 not between", value1, value2, "ext1");
return (Criteria) this;
}
public Criteria andExt2IsNull() {
addCriterion("ext_2 is null");
return (Criteria) this;
}
public Criteria andExt2IsNotNull() {
addCriterion("ext_2 is not null");
return (Criteria) this;
}
public Criteria andExt2EqualTo(String value) {
addCriterion("ext_2 =", value, "ext2");
return (Criteria) this;
}
public Criteria andExt2NotEqualTo(String value) {
addCriterion("ext_2 <>", value, "ext2");
return (Criteria) this;
}
public Criteria andExt2GreaterThan(String value) {
addCriterion("ext_2 >", value, "ext2");
return (Criteria) this;
}
public Criteria andExt2GreaterThanOrEqualTo(String value) {
addCriterion("ext_2 >=", value, "ext2");
return (Criteria) this;
}
public Criteria andExt2LessThan(String value) {
addCriterion("ext_2 <", value, "ext2");
return (Criteria) this;
}
public Criteria andExt2LessThanOrEqualTo(String value) {
addCriterion("ext_2 <=", value, "ext2");
return (Criteria) this;
}
public Criteria andExt2Like(String value) {
addCriterion("ext_2 like", value, "ext2");
return (Criteria) this;
}
public Criteria andExt2NotLike(String value) {
addCriterion("ext_2 not like", value, "ext2");
return (Criteria) this;
}
public Criteria andExt2In(List<String> values) {
addCriterion("ext_2 in", values, "ext2");
return (Criteria) this;
}
public Criteria andExt2NotIn(List<String> values) {
addCriterion("ext_2 not in", values, "ext2");
return (Criteria) this;
}
public Criteria andExt2Between(String value1, String value2) {
addCriterion("ext_2 between", value1, value2, "ext2");
return (Criteria) this;
}
public Criteria andExt2NotBetween(String value1, String value2) {
addCriterion("ext_2 not between", value1, value2, "ext2");
return (Criteria) this;
}
public Criteria andExt3IsNull() {
addCriterion("ext_3 is null");
return (Criteria) this;
}
public Criteria andExt3IsNotNull() {
addCriterion("ext_3 is not null");
return (Criteria) this;
}
public Criteria andExt3EqualTo(String value) {
addCriterion("ext_3 =", value, "ext3");
return (Criteria) this;
}
public Criteria andExt3NotEqualTo(String value) {
addCriterion("ext_3 <>", value, "ext3");
return (Criteria) this;
}
public Criteria andExt3GreaterThan(String value) {
addCriterion("ext_3 >", value, "ext3");
return (Criteria) this;
}
public Criteria andExt3GreaterThanOrEqualTo(String value) {
addCriterion("ext_3 >=", value, "ext3");
return (Criteria) this;
}
public Criteria andExt3LessThan(String value) {
addCriterion("ext_3 <", value, "ext3");
return (Criteria) this;
}
public Criteria andExt3LessThanOrEqualTo(String value) {
addCriterion("ext_3 <=", value, "ext3");
return (Criteria) this;
}
public Criteria andExt3Like(String value) {
addCriterion("ext_3 like", value, "ext3");
return (Criteria) this;
}
public Criteria andExt3NotLike(String value) {
addCriterion("ext_3 not like", value, "ext3");
return (Criteria) this;
}
public Criteria andExt3In(List<String> values) {
addCriterion("ext_3 in", values, "ext3");
return (Criteria) this;
}
public Criteria andExt3NotIn(List<String> values) {
addCriterion("ext_3 not in", values, "ext3");
return (Criteria) this;
}
public Criteria andExt3Between(String value1, String value2) {
addCriterion("ext_3 between", value1, value2, "ext3");
return (Criteria) this;
}
public Criteria andExt3NotBetween(String value1, String value2) {
addCriterion("ext_3 not between", value1, value2, "ext3");
return (Criteria) this;
}
}
/**
*/
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}

@ -1921,4 +1921,4 @@ public class ApiStarbucksProductsExample {
this(condition, value, secondValue, null);
}
}
}
}

@ -12,7 +12,7 @@ import java.util.Date;
* 代码由工具生成
*
**/
public class BsPushScheduldTask implements Serializable {
public class BsPushScheduleTask implements Serializable {
/**
* ID
*/
@ -208,7 +208,7 @@ public class BsPushScheduldTask implements Serializable {
if (getClass() != that.getClass()) {
return false;
}
BsPushScheduldTask other = (BsPushScheduldTask) that;
BsPushScheduleTask other = (BsPushScheduleTask) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getSourceType() == null ? other.getSourceType() == null : this.getSourceType().equals(other.getSourceType()))
&& (this.getSourceId() == null ? other.getSourceId() == null : this.getSourceId().equals(other.getSourceId()))
@ -270,4 +270,4 @@ public class BsPushScheduldTask implements Serializable {
sb.append("]");
return sb.toString();
}
}
}

@ -1,14 +0,0 @@
package com.hai.mobile.service;
/**
* @serviceName MobileHandleService.java
* @author Sum1Dream
* @version 1.0.0
* @Description // 话费业务处理
* @createTime 11:09 2023/5/17
**/
public interface MobileHandleService {
}

@ -1,6 +0,0 @@
package com.hai.mobile.service.impl;
import com.hai.mobile.service.MobileHandleService;
public class MobileHandleServiceImpl implements MobileHandleService {
}

@ -1,9 +1,11 @@
package com.hai.service;
import com.alibaba.fastjson.JSONObject;
import com.hai.entity.BsProductDiscount;
import com.hai.entity.BsProductPayType;
import com.hai.entity.BsProductPlatform;
import java.util.List;
import java.util.Map;
/**
@ -45,4 +47,7 @@ public interface BsConfigService {
*/
String getProductPayTypeByMap(Map<String, Object> map);
List<BsProductPayType> getProductPayTypeNewByMap(Map<String, Object> map);
}

@ -0,0 +1,62 @@
package com.hai.service;
import com.hai.entity.BsMsg;
import com.hai.entity.BsPushScheduleTask;
import com.hai.entity.HighUser;
import java.util.List;
import java.util.Map;
/**
* @serviceName BsPushScheduleTaskService.java
* @author Sum1Dream
* @version 1.0.0
* @Description // 定时发布任务功能
* @createTime 15:41 2023/6/27
**/
public interface BsPushScheduleTaskService {
/**
* @Author Sum1Dream
* @Name insertPushScheduleTask
* @Description // 新增发布任务
* @Date 18:06 2023/6/28
* @Param [bsPushScheduleTask]
* @Return void
*/
void insertPushScheduleTask(BsPushScheduleTask bsPushScheduleTask);
/**
* @Author Sum1Dream
* @Name updatePushScheduleTask
* @Description // 更新发布任务
* @Date 18:07 2023/6/28
* @Param [bsPushScheduleTask5]
* @Return void
*/
void updatePushScheduleTask(BsPushScheduleTask bsPushScheduleTask5);
/**
* @Author Sum1Dream
* @Name findPushScheduleTask
* @Description // 查询发布任务详情
* @Date 18:07 2023/6/28
* @Param [id]
* @Return com.hai.entity.BsMsg
*/
BsMsg findPushScheduleTask(Long id);
/**
* @Author Sum1Dream
* @Name getPushScheduleTaskByList
* @Description // 查询发布任务列表
* @Date 18:07 2023/6/28
* @Param [map]
* @Return java.util.List<com.hai.entity.BsMsg>
*/
List<BsMsg> getPushScheduleTaskByList(Map<String , Object> map);
}

@ -457,6 +457,17 @@ public interface HighOrderService {
*/
Map<String, Object> countGasOrder(Map<String, Object> param) throws Exception;
/**
* @Author Sum1Dream
* @Name HltCardNoTopUpStatistic
* @Description // 获取工会卡充值统计
* @Date 17:40 2023/6/26
* @Param [param]
* @Return java.util.Map<java.lang.String, java.lang.Object>
*/
Map<String, Object> hltCardNoTopUpStatistic();
/**
* 查询加油站订单列表
* @param orderNo

@ -16,6 +16,7 @@ public class ApiIpAddressServiceImpl implements ApiIpAddressService {
@Resource
private ApiIpAddressMapper apiIpAddressMapper;
@Override
public void insertApiIpAddress(ApiIpAddress apiIpAddress) {
apiIpAddressMapper.insert(apiIpAddress);

@ -1,5 +1,6 @@
package com.hai.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.hai.dao.BsProductDiscountMapper;
import com.hai.dao.BsProductPayTypeMapper;
import com.hai.dao.BsProductPlatformMapper;
@ -9,6 +10,7 @@ import org.apache.commons.collections4.MapUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -121,4 +123,53 @@ public class BsConfigServiceImpl implements BsConfigService {
}
}
@Override
public List<BsProductPayType> getProductPayTypeNewByMap(Map<String, Object> map) {
try {
BsProductPayTypeExample example = new BsProductPayTypeExample();
BsProductPayTypeExample.Criteria criteria = example.createCriteria();
// 获取平台编码
Integer platformId = MapUtils.getInteger(map , "platformId");
if (MapUtils.getInteger(map , "productType") != null) {
criteria.andProductTypeEqualTo(MapUtils.getInteger(map , "productType"));
}
if (MapUtils.getLong(map , "sourceId") != null) {
criteria.andSourceIdEqualTo(MapUtils.getLong(map , "sourceId"));
}
List<BsProductPayType> list = bsProductPayTypeMapper.selectByExample(example);
List<BsProductPayType> productPayTypes = new ArrayList<>();
// 1:支付宝 2:微信 3:汇联通工会卡 4:银联 5:银联分期 6 嗨森逛油卡 7:嗨森逛车队油卡 8:积分兑换
for (BsProductPayType productPayType : list) {
// platformId 1:小程序 2:h5 3:银联
if (platformId != null) {
if (platformId == 1 || platformId == 2) {
if (!(productPayType.getPayTypeId() == 4 || productPayType.getPayTypeId() == 5 )) {
productPayTypes.add(productPayType);
}
} else if (platformId == 3) {
if (productPayType.getPayTypeId() != 2) {
productPayTypes.add(productPayType);
}
}
}
}
return productPayTypes;
} catch (Exception e) {
System.out.println(e);
return null;
}
}
}

@ -0,0 +1,35 @@
package com.hai.service.impl;
import com.hai.entity.BsMsg;
import com.hai.entity.BsPushScheduleTask;
import com.hai.service.BsPushScheduleTaskService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@Service("bsPushScheduleTaskService")
public class BsPushScheduleTaskServiceImpl implements BsPushScheduleTaskService {
@Override
public void insertPushScheduleTask(BsPushScheduleTask bsPushScheduleTask) {
}
@Override
public void updatePushScheduleTask(BsPushScheduleTask bsPushScheduleTask5) {
}
@Override
public BsMsg findPushScheduleTask(Long id) {
return null;
}
@Override
public List<BsMsg> getPushScheduleTaskByList(Map<String, Object> map) {
return null;
}
}

@ -1350,6 +1350,11 @@ public class HighOrderServiceImpl implements HighOrderService {
return highOrderMapperExt.countGasStoreOrder(param);
}
@Override
public Map<String, Object> hltCardNoTopUpStatistic() {
return highOrderMapperExt.HltCardNoTopUpStatistic();
}
@Override
public GasOrderModel getGasOrderDetail(String orderNo) {
Map<String, Object> param = new HashMap<>();

@ -9,7 +9,6 @@ import com.hai.common.security.SessionObject;
import com.hai.common.security.UserCenter;
import com.hai.common.utils.BaiduUtils;
import com.hai.common.utils.DateUtil;
import com.hai.common.utils.HttpsUtils;
import com.hai.common.utils.RequestUtils;
import com.hai.dao.HighGoldRecMapper;
import com.hai.dao.HighUserLoginLogMapper;
@ -49,9 +48,6 @@ public class HighUserServiceImpl implements HighUserService {
@Resource
private HighUserCouponService highUserCouponService;
@Resource
private OutRechargeOrderService outRechargeOrderService;
@Resource
private HighUserCardService highUserCardService;
@ -112,6 +108,7 @@ public class HighUserServiceImpl implements HighUserService {
user.setInfoCompleteStatus(1); // 用户信息完整状态 0:完整 1:需要填写用户信息 2:需要填写手机号
user.setOpenId(MapUtils.getString(other, "openId"));
user.setUnionId(MapUtils.getString(other, "unionId"));
user.setOpenIdH5(MapUtils.getString(other, "openIdH5"));
user.setUnionUnionId(MapUtils.getString(other, "unionUnionId"));
highUserMapper.insert(user);
@ -128,6 +125,7 @@ public class HighUserServiceImpl implements HighUserService {
distributionUserRelService.insertDistributionRebate(user.getId(), popularizeUserId, region.getRegionId().toString());
}
}
user.setOpenIdH5(MapUtils.getString(other, "openIdH5"));
loginLog.setUserId(user.getId());
userLoginLogMapper.insert(loginLog);

@ -127,3 +127,5 @@ logisticsAppSecret=5ba7552b194e4147b7db1c34143e3317
payPostUrl=https://gratia-pay.dctpay.com/crest/
filesystem=https://hsgcs.dctpay.com/filesystem/
#payPostUrl=http://localhost:9601/crest/
#

File diff suppressed because one or more lines are too long

@ -97,6 +97,7 @@ public class AuthConfig implements WebMvcConfigurer {
.excludePathPatterns("/order/*")
.excludePathPatterns("/wxMsg/*")
.excludePathPatterns("/discount/*")
.excludePathPatterns("/fileUpload/*")
.excludePathPatterns("/orderRebate/*")
.excludePathPatterns("/refuelOnline/*")
;

@ -15,6 +15,8 @@ public class SysConfig {
private String wxAppId;
private String wxAppSecret;
private String fileUrl;
public String getWxH5AppId() {
return wxH5AppId;
}
@ -46,4 +48,12 @@ public class SysConfig {
public void setWxAppSecret(String wxAppSecret) {
this.wxAppSecret = wxAppSecret;
}
public String getFileUrl() {
return fileUrl;
}
public void setFileUrl(String fileUrl) {
this.fileUrl = fileUrl;
}
}

@ -0,0 +1,89 @@
package com.v1.controller.business;
import com.hai.common.utils.DateUtil;
import com.hai.common.utils.ResponseMsgUtil;
import com.hai.config.CommonConfig;
import com.hai.model.ResponseData;
import com.hai.service.FileUploadService;
import com.v1.config.SysConst;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileOutputStream;
import java.util.*;
@RestController
@RequestMapping(value="/fileUpload")
@Api(value="文件上传")
public class FileUploadController {
private static Logger log = LoggerFactory.getLogger(FileUploadController.class);
@Resource
private FileUploadService fileUploadService;
@RequestMapping(value="/uploadfile",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "文件上传")
public ResponseData uploadFile(@RequestParam(value = "files" , required = false) MultipartFile files,
HttpServletRequest request,
HttpServletResponse response) throws Exception {
try {
response.setHeader("Access-Control-Allow-Origin", "*");
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
request.getSession().getServletContext());
// 判断 request 是否有文件上传,即多部分请求
List<String> fileNames = new ArrayList<String>();
if (multipartResolver.isMultipart(request)) {
// 转换成多部分request
MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
Iterator<String> iterator = multiRequest.getFileNames();
while (iterator.hasNext()) {
MultipartFile file = multiRequest.getFile(iterator.next());
if (file != null) {
FileOutputStream out = null;
try {
String fileType = file.getOriginalFilename()
.substring(file.getOriginalFilename().lastIndexOf(".") + 1);
String fileName = file.getOriginalFilename().substring(0, file.getOriginalFilename().lastIndexOf(".")) + System.currentTimeMillis() + "." + fileType;
String childPath = DateUtil.date2String(new Date(), "yyyyMM");
String destDirName = SysConst.getSysConfig().getFileUrl() + File.separator + childPath;
File dir = new File(destDirName);
if (!dir.exists()) {
dir.mkdirs();
}
out = new FileOutputStream(destDirName + File.separator + fileName);
out.write(file.getBytes());
out.flush();
fileNames.add(childPath + "/" + fileName);
} catch (Exception e) {
log.error(e.getMessage(), e);
} finally {
if (out != null) {
out.close();
}
}
}
}
}
return ResponseMsgUtil.success(fileNames);
} catch (Exception e) {
log.error(e.getMessage(), e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -3,3 +3,5 @@ wxH5AppSecret=0e606fc1378d35e359fcf3f15570b2c5
wxAppId=wx8d49e2f83025229d
wxAppSecret=d8d6dcaef77d3b659258a01b5ddba5df
fileUrl=/home/project/hsg/filesystem

@ -0,0 +1,7 @@
wxH5AppId=wxa075e8509802f826
wxH5AppSecret=0e606fc1378d35e359fcf3f15570b2c5
wxAppId=wx8d49e2f83025229d
wxAppSecret=d8d6dcaef77d3b659258a01b5ddba5df
fileUrl=/home/project/hsg/filesystem

@ -3,3 +3,5 @@ wxH5AppSecret=0e606fc1378d35e359fcf3f15570b2c5
wxAppId=wx8d49e2f83025229d
wxAppSecret=d8d6dcaef77d3b659258a01b5ddba5df
fileUrl=/home/project/hsg/filesystem

Loading…
Cancel
Save