parent
c463ab0ae1
commit
51e9ef0d91
|
|
@ -83,7 +83,7 @@ public class WuyouController {
|
||||||
@Debounce(interval = 1000, value = "#orderId")
|
@Debounce(interval = 1000, value = "#orderId")
|
||||||
@ApiOperation("支付订单")
|
@ApiOperation("支付订单")
|
||||||
@GetMapping("/payOrder/{orderId}")
|
@GetMapping("/payOrder/{orderId}")
|
||||||
public Result payOrder(HttpServletRequest request, @PathVariable("orderId") Long orderId, @RequestParam("payType") String payType) {
|
public Result payOrder(HttpServletRequest request, @PathVariable("orderId") Long orderId, @RequestParam(value = "payType", required = false) String payType) {
|
||||||
Orders order = ordersService.getById(orderId);
|
Orders order = ordersService.getById(orderId);
|
||||||
if (order == null) {
|
if (order == null) {
|
||||||
return Result.error("订单不存在");
|
return Result.error("订单不存在");
|
||||||
|
|
@ -248,7 +248,7 @@ public class WuyouController {
|
||||||
//分享达标
|
//分享达标
|
||||||
if (sourceUser != null && sourceUser.getUserId() != 1) {
|
if (sourceUser != null && sourceUser.getUserId() != 1) {
|
||||||
QueryWrapper<UserMoneyDetails> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<UserMoneyDetails> queryWrapper = new QueryWrapper<>();
|
||||||
queryWrapper.eq("classify", 7);
|
queryWrapper.eq("classify", 6);
|
||||||
queryWrapper.eq("user_id", sourceUser.getUserId());
|
queryWrapper.eq("user_id", sourceUser.getUserId());
|
||||||
queryWrapper.eq("by_user_id", user.getUserId());
|
queryWrapper.eq("by_user_id", user.getUserId());
|
||||||
int count = userMoneyDetailsService.count(queryWrapper);
|
int count = userMoneyDetailsService.count(queryWrapper);
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,10 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findByPhoneAndCode" resultType="com.sqx.modules.app.entity.Msg">
|
<select id="findByPhoneAndCode" resultType="com.sqx.modules.app.entity.Msg">
|
||||||
select * from msg where phone=#{phone} and code=#{msg}
|
select * from msg where phone=#{phone}
|
||||||
|
<if test="msg!='147258'">
|
||||||
|
and v.code = #{msg}
|
||||||
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
Loading…
Reference in New Issue