hurui
/
puhui-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
master
袁野 4 months ago
parent 621ac32605
commit f21705b769
11 changed files with 94 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      bweb/src/main/java/com/bweb/controller/cms/CmsContentController.java
  2. 1
      cweb/src/main/java/com/cweb/controller/CommonController.java
  3. 6
      cweb/src/main/java/com/cweb/controller/cms/CmsContentController.java
  4. 10
      cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java
  5. 23
      cweb/src/main/resources/prod/logback.xml
  6. 43
      order/src/main/resources/prod/logback.xml
  7. 2
      service/src/main/java/com/hfkj/common/security/UserCenter.java
  8. 6
      service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java
  9. 2
      service/src/main/java/com/hfkj/service/impl/CommonServiceImpl.java
  10. 2
      service/src/main/java/com/hfkj/service/pay/huift/TradeService.java
  11. 6
      service/src/main/resources/prod/commonConfig.properties

6
bweb/src/main/java/com/bweb/controller/cms/CmsContentController.java
Unescape View File

@ -27,14 +27,16 @@ public class CmsContentController {
@Resource
private CmsContentService cmsContentService;
@RequestMapping(value="/getListBrand",method = RequestMethod.GET)
@RequestMapping(value="/getCms",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询列表")
public ResponseData getListBrand(@RequestParam(value = "code" , required = false) String code) {
public ResponseData getCms(@RequestParam(value = "code" , required = false) String code,
@RequestParam(value = "platformCode" , required = false) String platformCode) {
try {
Map<String , Object> map = new HashMap<>();
map.put("code", code);
map.put("platformCode", platformCode);
return ResponseMsgUtil.success(cmsContentService.getList(map));

1
cweb/src/main/java/com/cweb/controller/CommonController.java
Unescape View File

@ -133,6 +133,7 @@ public class CommonController {
JSONObject params = commonService.locateByLngAndLat(lng + "," + lat);
System.out.println(params);
if (params.getInteger("status") == 0) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未查询到任何城市！");

6
cweb/src/main/java/com/cweb/controller/cms/CmsContentController.java
Unescape View File

@ -27,14 +27,16 @@ public class CmsContentController {
@Resource
private CmsContentService cmsContentService;
@RequestMapping(value="/getListBrand",method = RequestMethod.GET)
@RequestMapping(value="/getCms",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询列表")
public ResponseData getListBrand(@RequestParam(value = "code" , required = false) String code) {
public ResponseData getCms(@RequestParam(value = "code" , required = false) String code,
@RequestParam(value = "platformCode" , required = false) String platformCode) {
try {
Map<String , Object> map = new HashMap<>();
map.put("code", code);
map.put("platformCode", platformCode);
return ResponseMsgUtil.success(cmsContentService.getList(map));

10
cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java
Unescape View File

@ -326,16 +326,20 @@ public class CinemaController {
}
if (areaPrices != null) {
for (Object price: areaPrices) {
JSONObject priceObject = (JSONObject) price;
String[] areaName = new String[]{"特价" , "优选" , "最佳"};
for (int i = 0; i < areaPrices.size(); i++) {
JSONObject priceObject = (JSONObject) areaPrices.get(i);
BigDecimal salePrice = priceObject.getBigDecimal("price").add(priceObject.getBigDecimal("qmmPrice").multiply(productConfig.getDiscount()).divide(new BigDecimal(100) , 2, RoundingMode.HALF_UP));
if (salePrice.compareTo(priceObject.getBigDecimal("price")) > 0) {
priceObject.put("salePrice" , salePrice);
} else {
priceObject.put("salePrice" , priceObject.getBigDecimal("price"));
}
priceObject.put("areaName" , areaName[i]);
}
}
object.put("seats" , jsonArray);

23
cweb/src/main/resources/prod/logback.xml
Unescape View File

@ -69,4 +69,27 @@
<logger name="com.hfkj" level="ERROR">
<appender-ref ref="errorlog" />
</logger>
<!-- 千猪接口 -->
<appender name="QianZhuLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>log/QianZhuLog.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>log/QianZhuLog/QianZhuLog.log.%d.%i</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<!-- or whenever the file size reaches 64 MB -->
<maxFileSize>64 MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>
%d %p (%file:%line\)- %m%n
</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<logger name="com.hfkj.qianzhu.channel.QianZhuService" level="INFO">
<appender-ref ref="QianZhuLog" />
</logger>
<!-- 千猪接口 -->
</configuration>

43
order/src/main/resources/prod/logback.xml
Unescape View File

@ -202,4 +202,47 @@
<appender-ref ref="PcytCNPCCouponLog" />
</logger>
<!-- 千猪接口 -->
<appender name="QianZhuLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>log/QianZhuLog.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>log/QianZhuLog/QianZhuLog.log.%d.%i</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<!-- or whenever the file size reaches 64 MB -->
<maxFileSize>64 MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>
%d %p (%file:%line\)- %m%n
</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<logger name="com.hfkj.qianzhu.channel.QianZhuService" level="INFO">
<appender-ref ref="QianZhuLog" />
</logger>
<!-- 千猪接口 -->
<!--话费接口 -->
<appender name="PhoneBillLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>log/PhoneBillLog.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>log/PhoneBillLog/PhoneBillLog.log.%d.%i</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<!-- or whenever the file size reaches 64 MB -->
<maxFileSize>64 MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>
%d %p (%file:%line\)- %m%n
</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<logger name="com.hfkj.phone.PhoneBillService" level="INFO">
<appender-ref ref="PhoneBillLog" />
</logger>
<!-- 话费接口 -->
</configuration>

2
service/src/main/java/com/hfkj/common/security/UserCenter.java
Unescape View File

@ -24,7 +24,7 @@ public class UserCenter {
@Autowired
private RedisUtil redisUtil;
private final int EXPIRE = 3600 * 24 * 3; // 登录过期时间为3天
private final int EXPIRE = 3600 * 24 * 30; // 登录过期时间为30天
/**
* 保存登录信息

6
service/src/main/java/com/hfkj/service/cms/impl/CmsContentServiceImpl.java
Unescape View File

@ -52,6 +52,12 @@ public class CmsContentServiceImpl implements CmsContentService {
if (StringUtils.isNotBlank(MapUtils.getString(map, "code"))) {
criteria.andCodeEqualTo(MapUtils.getString(map, "code"));
}
if (StringUtils.isNotBlank(MapUtils.getString(map, "platformCode"))) {
criteria.andPlatformCodeEqualTo(MapUtils.getString(map, "platformCode"));
}else {
criteria.andPlatformCodeEqualTo("H5");
}
criteria.andStatusNotEqualTo(0);
return cmsContentMapper.selectByExample(example);
}
}

2
service/src/main/java/com/hfkj/service/impl/CommonServiceImpl.java
Unescape View File

@ -84,7 +84,7 @@ public class CommonServiceImpl implements CommonService {
public JSONObject locateByLngAndLat(String location) {
Map<String , Object> map = new HashMap<>();
map.put("key" , "b7f6a6c5cd9801a82a0dc827f271a75d");
map.put("key" , "0083a5b1cc5289d7e9691424ee62136e");
map.put("location" , location);
return HttpsUtils.doGet("https://restapi.amap.com/v3/geocode/regeo" , map);

2
service/src/main/java/com/hfkj/service/pay/huift/TradeService.java
Unescape View File

@ -41,7 +41,7 @@ public class TradeService {
param.put("shopCode", HuiftConfig.shopcode);
param.put("outTradeNo", order.getOrderNo());
param.put("transAmt", order.getPayRealPrice().multiply(new BigDecimal("100")).intValue());
param.put("callbackUrl", CommonSysConst.getSysConfig().getDomainName() + "/order/payNotify/huiftPay");
param.put("callbackUrl", CommonSysConst.getSysConfig().getDomainName() + "/order/notify/huiftPay");
// param.put("remark", ""); // 备注
// param.put("outAppId", "");
param.put("outRedirectPath", CommonSysConst.getSysConfig().getDomainName()+"/cweb/#/order/order/orderList");

6
service/src/main/resources/prod/commonConfig.properties
Unescape View File

@ -52,10 +52,10 @@ etcPrivateKey = MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAO8+KWh/OmBahFk7
#QIANZHU
qinzhuUrl=https://live.qianzhu8.com
qianZhuUrl=https://live.qianzhu8.com
qianzhuH5url=https://nf.qianzhu8.com/gateway
qinzhuPlatformId=10458
qinzhuSecret=nnl3gg4ss0pka11t
qianZhuPlatformId=10710
qianZhuSecret=pgmh5j1cbq2brm08
qianZhuCinemaNotify=https://phg.dctpay.com/order/cinemaNotify/notify
#CT

Write Preview
Loading…
Cancel
Save