jk-GitHub-coder 4 سال پیش
والد
کامیت
3ec3c92997

+ 2 - 2
YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -175,7 +175,7 @@ public class ElectronicMembershipCardController {
                                             if(str.equals(currentTime)){  //如果当前时间在会员日活动时间内
                                                 //计算会员日内的总赠送积分
                                                 if(cardRechargeSettingList.get(0).getPresentScale() !=null){
-                                                    presentAmt = presentAmt.multiply(new BigDecimal(cardRechargeSettingList.get(0).getPresentScale())).add(presentAmt);
+                                                    presentAmt = presentAmt.multiply(new BigDecimal(cardRechargeSettingList.get(0).getPresentScale()).divide(new BigDecimal(100))).add(presentAmt);
                                                 }
                                                 break;
                                             }
@@ -206,7 +206,7 @@ public class ElectronicMembershipCardController {
                                             if(str.equals(currentTime)){  //如果当前时间在会员日活动时间内
                                                 //计算会员日期内的总赠送积分
                                                 if(cardRechargeSettingList.get(0).getPresentScale() !=null){
-                                                    presentAmt = presentAmt.multiply(new BigDecimal(cardRechargeSettingList.get(0).getPresentScale())).add(presentAmt);
+                                                    presentAmt = presentAmt.multiply(new BigDecimal(cardRechargeSettingList.get(0).getPresentScale()).divide(new BigDecimal(100))).add(presentAmt);
                                                 }
                                                 break;
                                             }

+ 1 - 1
YijiaRestful/src/main/resources/mapper/ElectronicMembershipCardMapper.xml

@@ -105,7 +105,7 @@
             </if>
         </where>
         <if test="orderBy !=null and orderBy !=''">
-            ORDER BY T2.discount_amt_end ${orderBy}
+            ORDER BY T2.discount_amt_start ${orderBy}
         </if>
 
     </select>