Commit 088f9f78 by XiaHou

查询展览纪念馆

parent efb5f72e
...@@ -8,10 +8,7 @@ import io.swagger.annotations.Api; ...@@ -8,10 +8,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/** /**
* @Author xh * @Author xh
...@@ -21,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -21,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@Api(tags = "福位相关接口", description = "福位控制器") @Api(tags = "福位相关接口", description = "福位控制器")
@RequestMapping("/bless") @RequestMapping("/bless")
@CrossOrigin(value = "*", maxAge = 3600)
public class BlessController { public class BlessController {
@Autowired @Autowired
......
...@@ -38,7 +38,7 @@ public class OshServicesOrderDTO implements Serializable { ...@@ -38,7 +38,7 @@ public class OshServicesOrderDTO implements Serializable {
@ApiModelProperty(value = "纪念次数") @ApiModelProperty(value = "纪念次数")
private Long times; private Long times;
@ApiModelProperty(value = "活跃值) @ApiModelProperty(value = "活跃值")
private BigDecimal sumTotalPrice; private BigDecimal sumTotalPrice;
} }
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<logger name="java.sql.PreparedStatement" level="DEBUG"/> <logger name="java.sql.PreparedStatement" level="DEBUG"/>
<!-- 日志输出级别 --> <!-- 日志输出级别 -->
<root level="INFO"> <root level="DEBUG">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT" />
<appender-ref ref="FILE" /> <appender-ref ref="FILE" />
</root> </root>
......
...@@ -10,10 +10,12 @@ spring: ...@@ -10,10 +10,12 @@ spring:
#���ݿ����� #���ݿ�����
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://lmerp001w.mysql.rds.aliyuncs.com/lmerp?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai #url: jdbc:mysql://lmerp001w.mysql.rds.aliyuncs.com/lmerp?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
username: test_erp #username: test_erp
password: Fzii591com #password: Fzii591com
url: jdbc:mysql://lmerp001w.mysql.rds.aliyuncs.com/lmerp_demo?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
username: dev_erp
password: fzii591COM
#url: jdbc:mysql://47.98.216.76:3306/atl-service-center?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 #url: jdbc:mysql://47.98.216.76:3306/atl-service-center?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#username: root #username: root
#password: 6just@2019 #password: 6just@2019
......
...@@ -206,10 +206,10 @@ ...@@ -206,10 +206,10 @@
</select> </select>
<select id="selectPayOrderTimes" parameterType="com.atlgroupasia.servicecenter.queryparam.QueryOrderRelationTimeParam" resultType="java.lang.Long"> <select id="selectPayOrderTimes" parameterType="com.atlgroupasia.servicecenter.queryparam.QueryOrderRelationTimeParam" resultType="java.lang.Long">
select IFNULL(count(*),0) from osh_services_order select IFNULL(count(*),0) from osh_services_order a
where pay_price is not null where a.pay_price is not null
<if test="relationTimeId != null"> <if test="relationTimeId != null">
and relation_time_id =#{relationTimeId} and a.relation_time_id = #{relationTimeId}
</if> </if>
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment