修复bug

.idea/compiler.xml

@@ -16,6 +16,17 @@
         <module name="jeecg-system-local-api" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="base-api" target="1.8" />
+      <module name="base-core" target="1.8" />
+      <module name="base-tools" target="1.8" />
+      <module name="jeecg-system-cloud-api" target="1.8" />
+      <module name="jeecg-system-local-api" target="1.8" />
+      <module name="module-base" target="1.8" />
+      <module name="module-common" target="1.8" />
+      <module name="module-pay" target="1.8" />
+      <module name="module-system" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">

admin-pc/.env.development

@@ -1,5 +1,6 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8002/building-admin/
+VUE_APP_API_BASE_URL=https://building-admin.hhlm1688.com/building-admin/
+# VUE_APP_API_BASE_URL=http://localhost:8002/building-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

admin-pc/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8002/building-admin/
+VUE_APP_API_BASE_URL=https://building-admin.hhlm1688.com/building-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

admin-pc/src/views/modules/CommonAddOrderList/CommonAddOrderList.vue

@@ -171,13 +171,13 @@ export default {
                     dataIndex: 'userId_dictText'
                 },
                 {
-                    title: '内容图片',
+                    title: '图片',
                     align: "center",
                     dataIndex: 'imageUrl',
                     scopedSlots: { customRender: 'imgSlot' }
                 },
                 {
-                    title: '语音图片',
+                    title: '语音',
                     align: "center",
                     dataIndex: 'voiceUrl',
                     scopedSlots: { customRender: 'fileSlot' }

admin-pc/src/views/modules/CommonAddOrderList/modules/CommonAddOrderForm.vue

@@ -9,12 +9,12 @@
                         </a-form-model-item>
                     </a-col>
                     <a-col :span="24">
-                        <a-form-model-item label="内容图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
+                        <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
                             <j-image-upload isMultiple v-model="model.imageUrl" disabled></j-image-upload>
                         </a-form-model-item>
                     </a-col>
                     <a-col :span="24">
-                        <a-form-model-item label="语音图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="voiceUrl">
+                        <a-form-model-item label="语音" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="voiceUrl">
                             <j-upload v-model="model.voiceUrl" disabled></j-upload>
                         </a-form-model-item>
                     </a-col>

module-common/src/main/java/org/jeecg/api/controller/AppletOrderController.java

@@ -38,12 +38,12 @@ public class AppletOrderController {
 
 
     //再次支付
-    @ApiOperation(value="再次支付", notes="再次支付")
-    @PostMapping(value = "/payOrder")
-    public Result<?> payOrder(@RequestHeader("X-Access-Token") String token,Integer type,String orderId)
-    {
-        return appletOrderService.payOrder(token,type,orderId);
-    }
+//    @ApiOperation(value="再次支付", notes="再次支付")
+//    @PostMapping(value = "/payOrder")
+//    public Result<?> payOrder(@RequestHeader("X-Access-Token") String token,Integer type,String orderId)
+//    {
+//        return appletOrderService.payOrder(token,type,orderId);
+//    }
 
     //确认收货
     @ApiOperation(value="确认收货", notes="确认收货")

module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java

@@ -40,6 +40,7 @@ import javax.transaction.Transactional;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 @Slf4j
@@ -301,7 +302,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
             CommonOrder commonOrder = commonOrderService.getById(orderId);
             if (commonOrder.getStatus().equals("0")){
                 if (hanHaiMember.getMoney().compareTo(commonOrder.getPrice())==-1){
-                    return Result.error("余额不足");
+                    return Result.error("积分不足");
                 }
             }
             if (commonOrder.getStatus().equals("0")){
@@ -392,7 +393,12 @@ public class AppletIndexServiceImpl implements AppletIndexService {
                         originalOrder.toString());
 
                 log.info("支付结果: {}", appOrder);
-                return Result.OK("支付成功", appOrder);
+
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("id", newOrderId);
+                map.put("pay", appOrder);
+
+                return Result.OK("支付成功", map);
             }
 
             return Result.OK("订单处理成功");
@@ -408,6 +414,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
         Page<CommonAddOrder> page = new Page<CommonAddOrder>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<CommonAddOrder> pageList = commonAddOrderService.lambdaQuery()
                 .eq(CommonAddOrder::getUserId,hanHaiMember.getId())
+                .orderByDesc(CommonAddOrder::getCreateTime)
                 .eq(StringUtils.isNotBlank(state),CommonAddOrder::getStatus,state)
                 .page(page);
         //得到集合

module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java

@@ -75,6 +75,19 @@ public class AppletLoginServiceImpl implements AppletLoginService {
 
         HanHaiMember member = memberService.lambdaQuery().eq(HanHaiMember::getAppletOpenid,wxOpenid).one();
         if (member == null) {
+
+            String shareId = null;
+            String vid = null;
+
+            //查询直推间推
+            if (StringUtils.isNotBlank(loginReq.getShareId())){
+                HanHaiMember byId = memberService.getById(loginReq.getShareId());
+                if (byId != null){
+                    shareId = loginReq.getShareId();
+                    vid = byId.getShareId();
+                }
+            }
+
             //如果user等于null说明该用户第一次登录，数据库没有该用户信息。
             loginReq.setOpenid(wxOpenid);
             loginReq.setSession_key(sessionKey);
@@ -82,6 +95,8 @@ public class AppletLoginServiceImpl implements AppletLoginService {
             member.setAppletOpenid(wxOpenid);
             member.setNickName(null);
             member.setHeadImage(loginReq.getHeadimgurl());
+            member.setVid(vid);
+            member.setShareId(shareId);
             // 生成token返回给小程序端
             String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid);
 //            member.setIntentionCode(String.valueOf(randomNumber));

module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java

@@ -205,7 +205,7 @@ public class AppletOrderServiceImpl implements AppletOrderService {
             commonMoneyLog.setMoney(commonOrder.getPrice());
             commonMoneyLog.setUserId(commonOrder.getUserId());
             commonMoneyLog.setOldMoney(member.getMoney());
-            commonMoneyLog.setType(1);
+            commonMoneyLog.setType(1);//支出
             commonMoneyLog.setState(1);
             commonMoneyLogService.save(commonMoneyLog);
 
@@ -216,11 +216,10 @@ public class AppletOrderServiceImpl implements AppletOrderService {
             log.info("订单直推佣金："+oneMoney);
             log.info("订单间推佣金："+twoMoney);
             //返佣
-            HanHaiMember hanHaiMember1 = hanHaiMemberService.getById(commonOrder.getUserId());
-            log.info("下单用户："+hanHaiMember1.getNickName()+"电话号码："+hanHaiMember1.getPhone());
+            log.info("下单用户："+member.getNickName()+"电话号码："+member.getPhone());
             log.info("订单号：" + commonOrder.getId());
             //上级标识
-            String oneId = hanHaiMember1.getShareId();
+            String oneId = member.getShareId();
             log.info("上级标识："+oneId);
             //如果上级标识不为空
             if(StringUtils.isNotBlank(oneId)){
@@ -246,7 +245,7 @@ public class AppletOrderServiceImpl implements AppletOrderService {
 
             }
             //上上级标识
-            String twoId = hanHaiMember1.getVid();
+            String twoId = member.getVid();
             log.info("上上级标识："+twoId);
             if(StringUtils.isNotBlank(twoId)){
                 HanHaiMember hanHaiMember3 = hanHaiMemberService.getById(twoId);
@@ -408,10 +407,17 @@ public class AppletOrderServiceImpl implements AppletOrderService {
 
 
             if (payType==0){
+
+                HanHaiMember member = hanHaiMemberService.getById(hanHaiMember.getId());
+
+                //a.compareTo(b) == 1
+                if (member.getMoney().compareTo(cityOrder.getPrice()) == -1){
+                    throw new RuntimeException("积分不足");
+                }
+
                 cityOrder.setTitle("余额支付订单");
                 cityOrder.setStatus("1");
                 commonOrderService.updateById(cityOrder);
-                HanHaiMember member = hanHaiMemberService.getById(hanHaiMember.getId());
                 member.setMoney(member.getMoney().subtract(cityOrder.getPrice()));
 
                 hanHaiMemberService.updateById(member);

module-common/src/main/java/org/jeecg/api/wxUtils/order/WxOrderLogisticsUtil.java

@@ -2,6 +2,7 @@ package org.jeecg.api.wxUtils.order;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
+import lombok.extern.log4j.Log4j2;
 import org.jeecg.api.wxUtils.HttpClientUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -16,6 +17,7 @@ import java.util.Map;
  * 微信公众平台订单物流配送工具
  */
 @Component
+@Log4j2
 public class WxOrderLogisticsUtil {
 
     @Value("${wechat.mpAppId}")
@@ -62,10 +64,10 @@ public class WxOrderLogisticsUtil {
         map.put("upload_time", new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX").format(new Date()));//上传时间，RFC 3339格式
 
         String s = HttpClientUtil.doPostJson(shipmentUrl + getAccessToken(), JSON.toJSONString(map));
-        System.out.println("=============================================");
-        System.out.println(s);
-        System.out.println("=============================================");
 
+        log.info("=============================================");
+        log.info("doShipmentOneself=" + s);
+        log.info("=============================================");
     }
 
     /**