Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/wxConfig.properties

src/main/java/org/springblade/gateway/common_gateway/dto/ActiveSettingDto.java

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.Min;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Author: Silent
@@ -39,5 +40,5 @@ public class ActiveSettingDto {
 	private Long rankTotal;
 
 	@ApiModelProperty("助力说明")
-	private String helpExplain;
+	private List<String> helpExplainList;
 }

src/main/java/org/springblade/sing/active/controller/ActiveProductRecordController.java

@@ -71,15 +71,18 @@ public class ActiveProductRecordController extends BladeController {
 
 		ActiveProductRecord detail = activeProductRecordService.getOne(Condition.getQueryWrapper(activeProductRecord));
 
-		//获取排名
-		String key = ActiveProductConstant.PRODUCT_SORT_CACHE_KEY.concat(":").concat(detail.getActiveId().toString());
-		Long revrank = bladeRedis.zRevrank(key, detail.getId());
-
-		//赋值
-		ActiveProductRecordVO activeProductRecordVO = ActiveProductRecordWrapper.build().entityVO(detail);
-		activeProductRecordVO.setRank(revrank + 1);
-
-		return R.data(activeProductRecordVO);
+		if (detail != null){
+			//获取排名
+			String key = ActiveProductConstant.PRODUCT_SORT_CACHE_KEY.concat(":").concat(detail.getActiveId().toString());
+			Long revrank = bladeRedis.zRevrank(key, detail.getId());
+
+			ActiveProductRecordVO activeProductRecordVO = ActiveProductRecordWrapper.build().entityVO(detail);
+			if (revrank != null){
+				activeProductRecordVO.setRank(revrank + 1);
+			}
+			return R.data(activeProductRecordVO);
+		}
+			return R.data(null);
 	}
 
 	/**
@@ -132,7 +135,7 @@ public class ActiveProductRecordController extends BladeController {
 	@Transactional(rollbackFor = Exception.class)
 	@ApiOperation(value = "新增或修改", notes = "传入activeProductRecord")
 	public R submit(@Valid @RequestBody ActiveProductRecord activeProductRecord) {
-		if(ObjectUtils.isNotEmpty(activeProductRecord.getProductNo())){
+		if(ObjectUtils.isEmpty(activeProductRecord.getProductNo())){
 			//查询最大值
 			Map<String, Object> map = activeProductRecordService.getMap(Wrappers.<ActiveProductRecord>query().select(new StringBuilder("IFNULL(max(")
 					.append(BeanPropertyUtil.getFieldNameToUnder(ActiveProductRecord::getProductNo)).append("),0) as NO").toString())

src/main/resources/application-dev.yml

@@ -64,5 +64,4 @@ cmcc:
     # 签名key
     signKey: b47366a9df9d
     # 回调地址
-    callbackUrl: https://ldt.guosen-fumao.cn/wapp/auth.html
-
+    callbackUrl: http://ldt.guosen-fumao.cn/

src/main/resources/wxConfig.properties

@@ -1,7 +1,18 @@
-#音乐之声
+#爱效科技
 wx.client.appId = wx432ac69188f554a9
 wx.client.appSecret = 25fbbd170a3c551f0d3498c16259bc36
 
+#guoxin
+#wx.appId = wx6dacff40877a1b1a
+#wx.appSecret = eac73798c4c509e43dc7cb475de82f4d
+
+#南粤药业
+#wx.appId = wx322e246549d7620d
+#wx.appSecret = 118059d75bc8c1a08162fc8a8cf5ac04
+
+# 音乐之声
+#wx.appId = wxf3f84c916a741cac
+#wx.appSecret = 8377629994436f17210500a11bbce6cc
 
 wx.shop.appId = wx2db9c41e85d5a4fc
 wx.shop.appSecret = 89a59cc73a3d77ac1e636ced0531cd08

src/test/java/org/springblade/test/BladeTest.java

@@ -1,12 +1,16 @@
 package org.springblade.test;
 
+import org.junit.runner.RunWith;
+import org.springblade.core.test.BladeBootTest;
+import org.springblade.core.test.BladeSpringRunner;
+
 /**
  * Blade单元测试
  *
  * @author Chill
  */
-//@RunWith(BladeSpringRunner.class)
-//@BladeBootTest(appName = "blade-runner", profile = "test")
+@RunWith(BladeSpringRunner.class)
+@BladeBootTest(appName = "blade-runner", profile = "test")
 public class BladeTest {
 
 	//@Test