Merge remote-tracking branch 'origin/master'

config/application-test-conf.yml

@@ -127,8 +127,8 @@ sms:
 
 global:
   path:
-    base_upload_location: /working/resource/eduServer/
-    base_discovery: 'http://192.168.1.12:8888/eduServer/'
+    base_upload_location: /working/file/
+    base_discovery: 'http://106.3.97.198:20164/file/'
   code:
     admin: ROLE_1001
   resetPassword: 123456
@@ -160,8 +160,8 @@ wx:
   timeOut: 3600
   pay:
     # 支付请求回调地址
-    notifyUrl: https://qf.91isoft.com/lh/app/wxPay/notifyCallBack
-    notifyRefundUrl: https://qf.91isoft.com/lh/app/wxPay/notifyRefundCallBack
+    notifyUrl: https://project.91isoft.com/sns/app/wxPay/notifyCallBack
+    notifyRefundUrl: https://project.91isoft.com/sns/app/wxPay/notifyRefundCallBack
     # 微信商户号
     mchId: 1615816319
     # 微信支付的商户密钥

src/main/java/org/rcisoft/app/login/service/impl/WxMiniServiceImpl.java

@@ -391,6 +391,10 @@ public class WxMiniServiceImpl implements WxMiniService {
         resultMap.put(CyWxMiniCons.DATA, sysUserRbac);
         MemInfo memberInfo = memInfoRepository.getInfoByUserId(String.valueOf(sysUserRbac.getBusinessId()));
         resultMap.put("memberId", memberInfo.getBusinessId());
+        //将会员信息存入redis
+        SysUser user = new SysUser();
+        BeanUtil.copyProperties(sysUserRbac, user);
+        cyRedisServiceImpl.set(RedisCons.MEMBER_INFO +":"+ sysUserRbac.getBusinessId(),user);
         return resultMap;
     }
 

src/main/java/org/rcisoft/business/cmsOrder/controller/CmsOrderController.java

@@ -201,4 +201,14 @@ public class CmsOrderController extends CyPaginationController<CmsOrder> {
                 CyMessCons.MESSAGE_ALERT_ERROR,
                 cmsOrderServiceImpl.manualCompensateOrder(dto));
     }
+
+    @CyOpeLogAnno(title = "system-订单管理-人工退单", businessType = CyLogTypeEnum.UPDATE)
+    @Operation(summary = "人工退单", description = "人工退单")
+    @PostMapping(value = "/cancel")
+    public CyResult cancel(@RequestBody CmsOrder orderInfo) {
+        return CyResultGenUtil.builder(new CyPersistModel(1),
+                CyMessCons.MESSAGE_ALERT_SUCCESS,
+                CyMessCons.MESSAGE_ALERT_ERROR,
+                cmsOrderServiceImpl.cancel(orderInfo));
+    }
 }