Browse Source

抵用券管理接口排序修改

anderx 7 years ago
parent
commit
6599f49b1c

+ 1 - 1
src/main/java/com/goafanti/common/mapper/JtVoucherDetailMapper.xml

@@ -336,7 +336,7 @@
 	<if test="sort == 2">
 		order by endTime
 	</if>
-	<if test="sortType != null">
+	<if test="sortType == 1">
 	 desc
 	 </if>
   	<if test="page_sql!=null">

+ 1 - 1
src/main/java/com/goafanti/voucher/controller/AdminVoucherController.java

@@ -13,7 +13,7 @@ import com.goafanti.common.utils.StringUtils;
 import com.goafanti.voucher.service.VoucherService;
 
 @RestController
-@RequestMapping(value = "/open/api/admin/voucher")
+@RequestMapping(value = "/api/admin/voucher")
 public class AdminVoucherController extends CertifyApiController {
 	 @Resource
 	 private VoucherService		voucherService;

+ 1 - 1
src/main/java/com/goafanti/voucher/controller/AdminVoucherDetailController.java

@@ -15,7 +15,7 @@ import com.goafanti.voucher.service.VoucherDetailService;
 import com.goafanti.voucher.service.VoucherService;
 
 @RestController
-@RequestMapping(value = "/open/api/admin/voucherDetail")
+@RequestMapping(value = "/api/admin/voucherDetail")
 public class AdminVoucherDetailController extends CertifyApiController {
 	
 	 @Resource

+ 1 - 1
src/main/java/com/goafanti/voucher/controller/UserVoucherController.java

@@ -14,7 +14,7 @@ import com.goafanti.voucher.service.VoucherDetailService;
 import com.goafanti.voucher.service.VoucherService;
 
 @RestController
-@RequestMapping(value = "/open/api/user/voucher")
+@RequestMapping(value = "/api/user/voucher")
 public class UserVoucherController extends CertifyApiController {
 	 @Resource
 	 private VoucherService		voucherService;

+ 1 - 1
src/main/java/com/goafanti/voucher/service/impl/VoucherServiceImpl.java

@@ -30,7 +30,7 @@ public class VoucherServiceImpl extends BaseMybatisDao<JtVoucherMapper> implemen
 		if (TokenManager.getToken() instanceof User&&TokenManager.getUserId()!=null) {
 			v.setGrantingUid(TokenManager.getUserId());
 		}
-		v.setGrantingUid("a8cd3226-2e6e-43c7-b4b0-1b72bd9cfa41");
+		//v.setGrantingUid("a8cd3226-2e6e-43c7-b4b0-1b72bd9cfa41");
 		return jtVoucherMapper.insertSelective(v);
 	}
 

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -55,9 +55,9 @@ app.name=AFT
 app.mobile.website=http://m.kedexinxi.com
 template.cacheable=false
 
-static.host=//sclient.jishutao.com:80/client/1.0.0
+static.host=//sclient.jishutao.com:8088/client/1.0.0
 
-portal.host=//sportal.jishutao.com:8088/portal/1.0.1
+portal.host=//sportal.jishutao.com:80/portal/1.0.1
 
 avatar.host=//sclient.jishutao.com
 avatar.upload.host=//sclient.jishutao.com/upload